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 29860f23ce..2482ac4f5b 100644
--- a/guacamole/src/main/frontend/src/app/client/controllers/clientController.js
+++ b/guacamole/src/main/frontend/src/app/client/controllers/clientController.js
@@ -498,17 +498,23 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
         $scope.menu.connectionParameters = newFocusedClient ?
             ManagedClient.getArgumentModel(newFocusedClient) : {};
 
+        // Re-broadcast the updated client
+        $scope.$broadcast('guacClientChanged'. newFocusedClient);
+
     });
 
     // Automatically update connection parameters that have been modified
     // for the current focused client
     $scope.$on('guacClientArgumentsUpdated', function focusedClientChanged(event, focusedClient) {
 
-        // Update available connection parameters, if the updated arguments are
-        // for the current focused client - otherwise ignore them
-        if ($scope.focusedClient && $scope.focusedClient === focusedClient)
+        // Ignore any updated arguments not for the current focused client
+        if ($scope.focusedClient && $scope.focusedClient === focusedClient) {
             $scope.menu.connectionParameters = ManagedClient.getArgumentModel(focusedClient);
 
+            // Re-broadcast the updated arguments
+            $scope.$broadcast('guacClientArgumentsChanged'. focusedClient);
+        }
+
     });
 
     // Update page icon when thumbnail changes
diff --git a/guacamole/src/main/frontend/src/app/client/styles/menu.css b/guacamole/src/main/frontend/src/app/client/styles/menu.css
index 81552b1686..b5742ab5d0 100644
--- a/guacamole/src/main/frontend/src/app/client/styles/menu.css
+++ b/guacamole/src/main/frontend/src/app/client/styles/menu.css
@@ -27,11 +27,11 @@
     background: #EEE;
     box-shadow: inset -1px 0 2px white, 1px 0 2px black;
     z-index: 100;
-    -webkit-transition: left 0.125s;
-    -moz-transition: left 0.125s;
-    -ms-transition: left 0.125s;
-    -o-transition: left 0.125s;
-    transition: left 0.125s;
+    -webkit-transition: left 0.125s, opacity 0.125s;
+    -moz-transition: left 0.125s, opacity 0.125s;
+    -ms-transition: left 0.125s, opacity 0.125s;
+    -o-transition: left 0.125s, opacity 0.125s;
+    transition: left 0.125s, opacity 0.125s;
 }
 
 .menu-content {
@@ -137,10 +137,10 @@
 .menu,
 .menu.closed {
     left: -480px;
-    visibility: hidden;
+    opacity: 0;
 }
 
 .menu.open {
     left: 0px;
-    visibility: visible;
+    opacity: 1;
 }
diff --git a/guacamole/src/main/frontend/src/app/client/templates/client.html b/guacamole/src/main/frontend/src/app/client/templates/client.html
index 943e599531..66dca3a770 100644
--- a/guacamole/src/main/frontend/src/app/client/templates/client.html
+++ b/guacamole/src/main/frontend/src/app/client/templates/client.html
@@ -47,7 +47,7 @@
     
     <!-- Menu -->
     <div class="menu" ng-class="{open: menu.shown}" id="guac-menu">
-        <div class="menu-content" guac-touch-drag="menuDrag">
+        <div class="menu-content" ng-if="menu.shown" guac-touch-drag="menuDrag">
 
             <!-- Stationary header -->
             <div class="header">