diff --git a/src/viewer.js b/src/viewer.js
index 39ed6294..b0ac0e47 100644
--- a/src/viewer.js
+++ b/src/viewer.js
@@ -2265,6 +2265,13 @@ function onBlur(){
 function onCanvasClick( event ) {
     var gestureSettings;
 
+    var haveKeyboardFocus = document.activeElement == this.keyboardCommandArea;
+
+    // If we don't have keyboard focus, request it.
+    if ( !haveKeyboardFocus ) {
+        this.keyboardCommandArea.focus();
+    }
+
     if ( !event.preventDefaultAction && this.viewport && event.quick ) {
         gestureSettings = this.gestureSettingsByDeviceType( event.pointerType );
         if ( gestureSettings.clickToZoom ) {