diff --git a/guacamole-common-js/src/main/resources/guacamole.js b/guacamole-common-js/src/main/resources/guacamole.js
index 8793293b2..177bb5afa 100644
--- a/guacamole-common-js/src/main/resources/guacamole.js
+++ b/guacamole-common-js/src/main/resources/guacamole.js
@@ -270,8 +270,9 @@ function GuacamoleClient(display, tunnelURL) {
             disconnect();
 
             // Show error by desaturating display
-            if (background)
-                background.filter(desaturateFilter);
+            for (var i=0; i<layers.length; i++) {
+                layers[i].filter(desaturateFilter);
+            }
 
             if (errorHandler)
                 errorHandler(error);
@@ -440,25 +441,59 @@ function GuacamoleClient(display, tunnelURL) {
     }
 
     // Layers
-    var displayWidth = null;
-    var displayHeight = null;
-    var background = null;
+    var displayWidth = 0;
+    var displayHeight = 0;
+
+    var layers = new Array();
+    var buffers = new Array();
     var cursor = null;
 
     function getLayer(index) {
 
-        // FIXME: Stub - does not actually handle layers or the layer index
+        // If negative index, use buffer
+        if (index < 0) {
 
-        if (background == null) {
-            background = new Layer(displayWidth, displayHeight);
+            index = -1 - index;
+            var buffer = buffers[index];
 
-            if (cursor != null)
-                display.insertBefore(background, cursor);
-            else
-                display.appendChild(background);
+            // Create buffer if necessary
+            if (buffer == null) {
+                buffer = new Layer(0, 0);
+                buffers[index] = buffer;
+            }
+
+            return buffer;
         }
 
-        return background;
+        // If non-negative, use visible layer
+        else {
+
+            var layer = layers[index];
+            if (layer == null) {
+
+                // Add new layer
+                layer = new Layer(displayWidth, displayHeight);
+                layers[index] = layer;
+
+                // Remove all children
+                display.innerHTML = "";
+
+                // Add existing layers in order
+                for (var i=0; i<layers.length; i++)
+                    display.appendChild(layers[i]);
+
+                // Add cursor layer last
+                if (cursor != null)
+                    display.appendChild(cursor);
+
+            }
+            else {
+                // Reset size
+                layer.resize(displayWidth, displayHeight);
+            }
+
+            return layer;
+        }
 
     }
 
@@ -487,7 +522,9 @@ function GuacamoleClient(display, tunnelURL) {
                 display.style.height = displayHeight + "px";
             }
 
-            // Set cursor layer width/height here
+            // Set cursor layer width/height
+            if (cursor != null)
+                cursor.resize(displayWidth, displayHeight);
 
         },
 
diff --git a/guacamole-common-js/src/main/resources/layer.js b/guacamole-common-js/src/main/resources/layer.js
index 380568383..9143ca6e3 100644
--- a/guacamole-common-js/src/main/resources/layer.js
+++ b/guacamole-common-js/src/main/resources/layer.js
@@ -21,16 +21,27 @@ function Layer(width, height) {
 
     // Off-screen buffer
     var display = document.createElement("canvas");
-
-    display.style.position = "absolute";
-    display.style.left = "0px";
-    display.style.right = "0px";
-
-    display.width = width;
-    display.height = height;
-
     var displayContext = display.getContext("2d");
 
+    function resize(newWidth, newHeight) {
+        display.style.position = "absolute";
+        display.style.left = "0px";
+        display.style.right = "0px";
+
+        display.width = newWidth;
+        display.height = newHeight;
+
+        width = newWidth;
+        height = newHeight;
+    }
+
+    display.resize = function(newWidth, newHeight) {
+        if (newWidth != width || newHeight != height)
+            resize(newWidth, newHeight);
+    }
+
+    resize(width, height);
+
     var readyHandler = null;
     var nextUpdateToDraw = 0;
     var currentUpdate = 0;