From 4ee565a8bba44b85b7e8b2bc4b434e5147ea4d0f Mon Sep 17 00:00:00 2001
From: jahorton <jahorton@sil.org>
Date: Fri, 11 Sep 2020 12:39:07 +0700
Subject: [PATCH] fix(web): default layout shift not changing layer

---
 .../keyboard-processor/src/keyboards/defaultLayouts.ts    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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':