diff --git a/public/js/commandline.js b/public/js/commandline.js
index 95fcaa482..64c0b12cc 100644
--- a/public/js/commandline.js
+++ b/public/js/commandline.js
@@ -1510,7 +1510,7 @@ if (Object.keys(layouts).length > 0) {
       id: "changeLayout" + capitalizeFirstLetter(layout),
       display: layout.replace(/_/g, " "),
       exec: () => {
-        changeLayout(layout);
+        changeSavedLayout(layout);
         restartTest();
         saveConfigToCookie();
       },
diff --git a/public/js/settings.js b/public/js/settings.js
index e19cd1198..f052a9d0c 100644
--- a/public/js/settings.js
+++ b/public/js/settings.js
@@ -229,7 +229,7 @@ settingsGroups.capsLockBackspace = new SettingsGroup(
   "capsLockBackspace",
   setCapsLockBackspace
 );
-settingsGroups.layout = new SettingsGroup("layout", changeLayout);
+settingsGroups.layout = new SettingsGroup("layout", changeSavedLayout);
 settingsGroups.language = new SettingsGroup("language", changeLanguage);
 settingsGroups.fontSize = new SettingsGroup("fontSize", changeFontSize);
 settingsGroups.pageWidth = new SettingsGroup("pageWidth", setPageWidth);
diff --git a/public/js/userconfig.js b/public/js/userconfig.js
index 799b57d0a..02904a2b9 100644
--- a/public/js/userconfig.js
+++ b/public/js/userconfig.js
@@ -167,7 +167,7 @@ function applyConfig(configObj) {
     changeWordCount(configObj.words, true);
     changeLanguage(configObj.language, true);
     setCapsLockBackspace(configObj.capsLockBackspace, true);
-    changeLayout(configObj.savedLayout, true);
+    changeSavedLayout(configObj.savedLayout, true);
     changeFontSize(configObj.fontSize, true);
     setFreedomMode(configObj.freedomMode, true);
     setCaretStyle(configObj.caretStyle, true);
@@ -1181,6 +1181,14 @@ function changeLayout(layout, nosave) {
   if (!nosave) saveConfigToCookie();
 }
 
+function changeSavedLayout(layout, nosave) {
+  if (layout == null || layout == undefined) {
+    layout = "qwerty";
+  }
+  config.savedLayout = layout;
+  changeLayout(layout, nosave);
+}
+
 function changeKeymapMode(mode, nosave) {
   if (mode == null || mode == undefined) {
     mode = "off";