diff --git a/guacamole/src/main/webapp/app/index/styles/lists.css b/guacamole/src/main/webapp/app/index/styles/lists.css
index 60b895243..01c5ec318 100644
--- a/guacamole/src/main/webapp/app/index/styles/lists.css
+++ b/guacamole/src/main/webapp/app/index/styles/lists.css
@@ -75,7 +75,7 @@ div.recent-connections .protocol {
     vertical-align: middle;
 }
 
-.caption > * {
+.caption .choice {
     display: inline-block;
 }
 
diff --git a/guacamole/src/main/webapp/app/manage/templates/connection.html b/guacamole/src/main/webapp/app/manage/templates/connection.html
index b2d1c770b..b92988048 100644
--- a/guacamole/src/main/webapp/app/manage/templates/connection.html
+++ b/guacamole/src/main/webapp/app/manage/templates/connection.html
@@ -21,12 +21,15 @@
        THE SOFTWARE.
     -->
 
-    <!-- Connection icon -->
-    <div class="protocol">
-        <div class="icon type" ng-class="item.protocol"></div>
+    <div class="caption">
+
+        <!-- Connection icon -->
+        <div class="protocol">
+            <div class="icon type" ng-class="item.protocol"></div>
+        </div>
+
+        <!-- Connection name -->
+        <span class="name">{{item.name}}</span>
+
     </div>
-
-    <!-- Connection name -->
-    <span class="name">{{item.name}}</span>
-
 </a>
diff --git a/guacamole/src/main/webapp/app/manage/templates/manage.html b/guacamole/src/main/webapp/app/manage/templates/manage.html
index d079c3fe4..9795ebe07 100644
--- a/guacamole/src/main/webapp/app/manage/templates/manage.html
+++ b/guacamole/src/main/webapp/app/manage/templates/manage.html
@@ -45,10 +45,12 @@ THE SOFTWARE.
             <!-- List of users this user has access to -->
             <div class="user-list">
                 <div ng-repeat="user in users | orderBy : 'username'" class="user list-item">
-                    <div class="caption">
-                        <div class="icon user"></div>
-                        <a class="name" ng-href="#/manage/users/{{user.username}}">{{user.username}}</a>
-                    </div>
+                    <a ng-href="#/manage/users/{{user.username}}">
+                        <div class="caption">
+                            <div class="icon user"></div>
+                            <span class="name">{{user.username}}</span>
+                        </div>
+                    </a>
                 </div>
             </div>
         </div>