diff --git a/guacamole/src/main/webapp/index.xhtml b/guacamole/src/main/webapp/index.xhtml
index 1ad102632..e86778cbb 100644
--- a/guacamole/src/main/webapp/index.xhtml
+++ b/guacamole/src/main/webapp/index.xhtml
@@ -66,15 +66,15 @@
         <!-- Connection list UI -->
         <div id="connection-list-ui" style="display: none">
 
+            <div id="logout">
+                <a href="logout">Logout</a>
+            </div>
+            
             <h1>
                 <img class="logo" src="images/guacamole-logo-64.png" alt=""/>
                 Available Connections
             </h1>
             
-            <div id="logout">
-                <a href="logout">Logout</a>
-            </div>
-            
             <table class="connections">
                 <thead>
                     <tr>
diff --git a/guacamole/src/main/webapp/styles/login.css b/guacamole/src/main/webapp/styles/login.css
index 728866afc..1db2c03b9 100644
--- a/guacamole/src/main/webapp/styles/login.css
+++ b/guacamole/src/main/webapp/styles/login.css
@@ -203,4 +203,10 @@ div#connection-list-ui h1 {
 
 div#connection-list-ui img {
     vertical-align: middle;
-}
\ No newline at end of file
+}
+
+div#logout {
+    padding: 0.5em;
+    text-align: right;
+    float: right;
+}