diff --git a/src/viewer.js b/src/viewer.js
index ca5b6303..9bc939aa 100644
--- a/src/viewer.js
+++ b/src/viewer.js
@@ -2666,8 +2666,8 @@ function onCanvasKeyDown( event ) {
     var canvasKeyDownEventArgs = {
       originalEvent: event.originalEvent,
       preventDefaultAction: false,
-      preventVerticalPan: event.preventVerticalPan,
-      preventHorizontalPan: event.preventHorizontalPan
+      preventVerticalPan: event.preventVerticalPan || !this.panVertical,
+      preventHorizontalPan: event.preventHorizontalPan || !this.panHorizontal
     };
 
     /**
@@ -2737,8 +2737,8 @@ function onCanvasKeyPress( event ) {
     var canvasKeyPressEventArgs = {
       originalEvent: event.originalEvent,
       preventDefaultAction: false,
-      preventVerticalPan: event.preventVerticalPan,
-      preventHorizontalPan: event.preventHorizontalPan
+      preventVerticalPan: event.preventVerticalPan || !this.panVertical,
+      preventHorizontalPan: event.preventHorizontalPan || !this.panHorizontal
     };
 
     // This event is documented in onCanvasKeyDown
@@ -2788,8 +2788,8 @@ function onCanvasKeyPress( event ) {
                 break;
             case 97://a
                 if (!canvasKeyPressEventArgs.preventHorizontalPan) {
-                  this.viewport.panBy(this.viewport.deltaPointsFromPixels(new $.Point(-40, 0)));
-                  this.viewport.applyConstraints();
+                    this.viewport.panBy(this.viewport.deltaPointsFromPixels(new $.Point(-40, 0)));
+                    this.viewport.applyConstraints();
                 }
                 event.preventDefault = true;
                 break;
diff --git a/test/demo/basic.html b/test/demo/basic.html
index e238e5e1..4fe267bd 100644
--- a/test/demo/basic.html
+++ b/test/demo/basic.html
@@ -27,7 +27,6 @@
             tileSources: "../data/testpattern.dzi",
             showNavigator:true
         });
-
     </script>
 </body>
 </html>