diff --git a/guacamole/src/main/frontend/src/app/client/directives/guacClientPanel.js b/guacamole/src/main/frontend/src/app/client/directives/guacClientPanel.js
index efd23932d..1aaafec4c 100644
--- a/guacamole/src/main/frontend/src/app/client/directives/guacClientPanel.js
+++ b/guacamole/src/main/frontend/src/app/client/directives/guacClientPanel.js
@@ -84,7 +84,10 @@ angular.module('client').directive('guacClientPanel', ['$injector', function gua
              *     panel, false otherwise.
              */
             $scope.hasClientGroups = function hasClientGroups() {
-                return $scope.clientGroups && $scope.clientGroups.length;
+                return $scope.clientGroups && $scope.clientGroups.some(function(group) {
+                    // Check if there is any group that is not attached
+                    return !group.attached;
+                });
             };
 
             /**