diff --git a/guacamole/src/main/webapp/client.xhtml b/guacamole/src/main/webapp/client.xhtml
index 9e859850a..3c9460ae6 100644
--- a/guacamole/src/main/webapp/client.xhtml
+++ b/guacamole/src/main/webapp/client.xhtml
@@ -148,8 +148,8 @@
                         // Scale width/height to be at least 600x600
                         if (optimal_width < 600 || optimal_height < 600) {
                             var scale = Math.max(600 / optimal_width, 600 / optimal_height);
-                            optimal_width *= scale;
-                            optimal_height *= scale;
+                            optimal_width = Math.floor(optimal_width * scale);
+                            optimal_height = Math.floor(optimal_height * scale);
                         }
 
                         // Get entire query string, and pass to connect().
diff --git a/guacamole/src/main/webapp/scripts/interface.js b/guacamole/src/main/webapp/scripts/interface.js
index 7fe91e18a..48b0abb94 100644
--- a/guacamole/src/main/webapp/scripts/interface.js
+++ b/guacamole/src/main/webapp/scripts/interface.js
@@ -149,7 +149,7 @@ GuacamoleUI.supportedAudio = [];
     };
 
     GuacamoleUI.hideTouchMenu = function() {
-        GuacamoleUI.touchMenu.style.visibility = "hidden";
+        GuacamoleUI.touchMenu.style.display = "none";
     };
 
     function positionCentered(element) {
@@ -165,8 +165,8 @@ GuacamoleUI.supportedAudio = [];
     }
 
     GuacamoleUI.showTouchMenu = function() {
+        GuacamoleUI.touchMenu.style.display= "";
         positionCentered(GuacamoleUI.touchMenu);
-        GuacamoleUI.touchMenu.style.visibility = "visible";
     };
 
     GuacamoleUI.hideTouchClipboard = function() {
diff --git a/guacamole/src/main/webapp/styles/client.css b/guacamole/src/main/webapp/styles/client.css
index c3d8887a6..e54768a5b 100644
--- a/guacamole/src/main/webapp/styles/client.css
+++ b/guacamole/src/main/webapp/styles/client.css
@@ -262,7 +262,7 @@ textarea#eventTarget {
 div#touchMenu {
 
     position: absolute;
-    visibility: hidden;
+    display: none;
     z-index: 4;
     
     white-space: pre;