diff --git a/guacamole/src/main/frontend/src/app/client/styles/tiled-client-grid.css b/guacamole/src/main/frontend/src/app/client/styles/tiled-client-grid.css
index 06bcaf62a..b7d044fb2 100644
--- a/guacamole/src/main/frontend/src/app/client/styles/tiled-client-grid.css
+++ b/guacamole/src/main/frontend/src/app/client/styles/tiled-client-grid.css
@@ -80,19 +80,6 @@
     padding: 0 0.25em;
     font-size: 0.8em;
     color: white;
-    display: none;
-}
-
-.tiled-client-grid.multiple-clients .client-tile .client-tile-name {
-    display: block;
-}
-
-.tiled-client-grid.multiple-clients .client-tile {
-    border: 1px solid #444;
-}
-
-.tiled-client-grid .client-tile.focused {
-    border-color: #3161a9;
 }
 
 .tiled-client-grid .client-tile.focused .client-tile-name {
diff --git a/guacamole/src/main/frontend/src/app/client/templates/guacTiledClients.html b/guacamole/src/main/frontend/src/app/client/templates/guacTiledClients.html
index 3f79153f7..619fdb062 100644
--- a/guacamole/src/main/frontend/src/app/client/templates/guacTiledClients.html
+++ b/guacamole/src/main/frontend/src/app/client/templates/guacTiledClients.html
@@ -1,6 +1,4 @@
-<div class="tiled-client-grid"
-    ng-class="{  'multiple-clients' : hasMultipleClients(clientGroup) }">
-
+<div class="tiled-client-grid">
     <div class="tiled-client-row" ng-repeat="clientRow in getClientGrid(clientGroup)">
         <div class="tiled-client-cell" ng-repeat="client in clientRow">
 
@@ -10,7 +8,10 @@
                     'shared'  : isShared(client)
                 }"
                 guac-click="getFocusAssignmentCallback(client)">
-                <h3 class="client-tile-name"><img class="client-tile-shared-indicator" src="images/share-white.svg"> {{ client.title }}</h3>
+                <h3 class="client-tile-name" ng-if="hasMultipleClients(clientGroup)">
+                    <img class="client-tile-shared-indicator" src="images/share-white.svg">
+                    {{ client.title }}
+                </h3>
                 <guac-client client="client" emulate-absolute-mouse="emulateAbsoluteMouse"></guac-client>
 
                 <!-- Client-specific status/error dialog -->
@@ -19,5 +20,4 @@
 
         </div>
     </div>
-
 </div>