diff --git a/common/core/web/keyboard-processor/src/keyboards/defaultLayouts.ts b/common/core/web/keyboard-processor/src/keyboards/defaultLayouts.ts
index ddfe3e465e..859e870bb2 100644
--- a/common/core/web/keyboard-processor/src/keyboards/defaultLayouts.ts
+++ b/common/core/web/keyboard-processor/src/keyboards/defaultLayouts.ts
@@ -419,8 +419,12 @@ namespace com.keyman.keyboards {
               if(layerId.indexOf('shift') != -1) {
                 key['sp'] = buttonClasses['SHIFT-ON'];
               } 
-              if((formFactor != 'desktop') && (layerId != 'default')) {
-                key['nextlayer']='default';
+              if(formFactor != 'desktop') {
+                if(layerId != 'default') {
+                  key['nextlayer']='default';
+                } else {
+                  key['nextlayer']='shift';
+                }
               }
               break;
             case 'K_LCTRL':