diff --git a/guacamole/src/main/webapp/scripts/client-ui.js b/guacamole/src/main/webapp/scripts/client-ui.js
index 97addb753..30da41ba6 100644
--- a/guacamole/src/main/webapp/scripts/client-ui.js
+++ b/guacamole/src/main/webapp/scripts/client-ui.js
@@ -255,6 +255,18 @@ GuacUI.Client.PanOverlay = function() {
     GuacUI.createChildElement(pan_overlay, "div", "indicator right");
     GuacUI.createChildElement(pan_overlay, "div", "indicator left");
 
+    /*
+     * Add exit button
+     */
+
+    var back = GuacUI.createChildElement(pan_overlay, "p", "hint");
+    back.textContent = "Tap here to exit panning mode";
+
+    // Return to interactive when back is clicked
+    back.addEventListener("click", function() {
+        GuacUI.StateManager.setState(GuacUI.Client.states.INTERACTIVE);
+    }, false);
+
     this.show = function() {
         document.body.appendChild(pan_overlay);
     };
diff --git a/guacamole/src/main/webapp/styles/client.css b/guacamole/src/main/webapp/styles/client.css
index c339382a3..0cb1543b2 100644
--- a/guacamole/src/main/webapp/styles/client.css
+++ b/guacamole/src/main/webapp/styles/client.css
@@ -263,3 +263,22 @@ div#viewportClone {
     color: #D44;
 }
 
+p.hint {
+    
+    border: 0.25em solid rgba(255, 255, 255, 0.25);
+    background: black;
+    opacity: 0.75;
+
+    color: white;
+
+    max-width: 10em;
+    padding: 1em;
+    margin: 1em;
+
+    position: absolute;
+    left: 0;
+    top: 0;
+
+    box-shadow: 0.25em 0.25em 0.25em rgba(0, 0, 0, 0.75);
+    
+}
\ No newline at end of file