diff --git a/guacamole-common-js/src/main/resources/guacamole.js b/guacamole-common-js/src/main/resources/guacamole.js
index ffd905396..8aaef9612 100644
--- a/guacamole-common-js/src/main/resources/guacamole.js
+++ b/guacamole-common-js/src/main/resources/guacamole.js
@@ -34,6 +34,9 @@ function GuacamoleClient(display, tunnelURL) {
     var stateChangeHandler = null;
     var pollResponse = 1; // Default to polling - will be turned off automatically if not needed
 
+    // Display must be relatively positioned for mouse to be handled properly
+    display.style.position = "relative";
+
     function setState(state) {
         if (state != currentState) {
             currentState = state;
@@ -560,10 +563,8 @@ function GuacamoleClient(display, tunnelURL) {
             displayHeight = parseInt(parameters[1]);
 
             // Update (set) display size
-            if (display) {
-                display.style.width = displayWidth + "px";
-                display.style.height = displayHeight + "px";
-            }
+            display.style.width = displayWidth + "px";
+            display.style.height = displayHeight + "px";
 
             // Set cursor layer width/height
             if (cursor != null)
diff --git a/guacamole-common-js/src/main/resources/layer.js b/guacamole-common-js/src/main/resources/layer.js
index da5606c92..ae5cf2245 100644
--- a/guacamole-common-js/src/main/resources/layer.js
+++ b/guacamole-common-js/src/main/resources/layer.js
@@ -26,7 +26,7 @@ function Layer(width, height) {
     function resize(newWidth, newHeight) {
         display.style.position = "absolute";
         display.style.left = "0px";
-        display.style.right = "0px";
+        display.style.top = "0px";
 
         display.width = newWidth;
         display.height = newHeight;