diff --git a/guacamole/src/main/frontend/src/app/client/controllers/clientController.js b/guacamole/src/main/frontend/src/app/client/controllers/clientController.js
index 980d71b3c..12899b7ea 100644
--- a/guacamole/src/main/frontend/src/app/client/controllers/clientController.js
+++ b/guacamole/src/main/frontend/src/app/client/controllers/clientController.js
@@ -452,8 +452,9 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
     // Update client state/behavior as visibility of the Guacamole menu changes
     $scope.$watch('menu.shown', function menuVisibilityChanged(menuShown, menuShownPreviousState) {
 
-        // Update available connection parameters, if there is a focused
-        // client
+        // Re-update available connection parameters, if there is a focused
+        // client (parameter information may not have been available at the
+        // time focus changed)
         if (menuShown)
             $scope.menu.connectionParameters = $scope.focusedClient ?
                 ManagedClient.getArgumentModel($scope.focusedClient) : {};
@@ -474,6 +475,11 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
         if (oldFocusedClient)
             $scope.applyParameterChanges(oldFocusedClient);
 
+        // Update available connection parameters, if there is a focused
+        // client
+        $scope.menu.connectionParameters = newFocusedClient ?
+            ManagedClient.getArgumentModel(newFocusedClient) : {};
+
     });
 
     // Update page icon when thumbnail changes