diff --git a/windows/src/developer/TIKE/child/UfrmKeymanWizard.pas b/windows/src/developer/TIKE/child/UfrmKeymanWizard.pas
index b5366d0795..570c54ac6d 100644
--- a/windows/src/developer/TIKE/child/UfrmKeymanWizard.pas
+++ b/windows/src/developer/TIKE/child/UfrmKeymanWizard.pas
@@ -763,6 +763,9 @@ end;
 
 procedure TfrmKeymanWizard.FocusTabTouchLayout;   // I3885
 begin
+  if pagesTouchLayout.ActivePage = pageTouchLayoutDesign
+    then DoFocus(frameTouchLayout)
+    else DoFocus(frameTouchLayoutSource);
 end;
 
 {-----------------------------------------------------------------------------}
@@ -3172,7 +3175,9 @@ begin
   begin
     frameTouchLayoutSource.EditorText := frameTouchLayout.SaveToString;
     DoFocus(frameTouchLayoutSource);
-  end;
+  end
+  else
+    DoFocus(frameTouchLayout);
   FLoading := False;
 end;
 
diff --git a/windows/src/developer/TIKE/oskbuilder/UframeTouchLayoutBuilder.pas b/windows/src/developer/TIKE/oskbuilder/UframeTouchLayoutBuilder.pas
index 62046296a2..78fb84302f 100644
--- a/windows/src/developer/TIKE/oskbuilder/UframeTouchLayoutBuilder.pas
+++ b/windows/src/developer/TIKE/oskbuilder/UframeTouchLayoutBuilder.pas
@@ -115,6 +115,7 @@ type
 
   public
     { Public declarations }
+    procedure SetFocus; override;
     procedure SetupCharMapDrop;
     function Load(const AFilename: string; ALoadFromTemplate, ALoadFromString: Boolean): Boolean;
     procedure Save(const AFilename: string);
@@ -608,6 +609,11 @@ begin
   cef.cef.SelectAll;
 end;
 
+procedure TframeTouchLayoutBuilder.SetFocus;
+begin
+  cef.SetFocus;
+end;
+
 procedure TframeTouchLayoutBuilder.SetFontInfo(Index: TKeyboardFont; const Value: TKeyboardFontInfo);   // I4057
 var
   s: string;