diff --git a/assets/JS_INIT.js b/assets/JS_INIT.js
index 58577d4..e1678c2 100644
--- a/assets/JS_INIT.js
+++ b/assets/JS_INIT.js
@@ -426,7 +426,7 @@ con.KEY_INSERT = 210;
 con.KEY_DELETE = 211;
 con.KEY_BACKSPACE = 8;
 con.KEY_TAB = 9;
-con.KEY_RETURN = 13;
+con.KEY_RETURN = 10;
 con.getch = function() {
     return sys.readKey();
 };
diff --git a/assets/disk0/tvdos/bin/command.js b/assets/disk0/tvdos/bin/command.js
index 1c262c7..676c383 100644
--- a/assets/disk0/tvdos/bin/command.js
+++ b/assets/disk0/tvdos/bin/command.js
@@ -319,6 +319,10 @@ shell.coreutils = {
             }
             else {
                 _TVDOS.variables[key] = shell.replaceVarCall(value);
+
+                // if key is KEYBOARD, reload the keyboard layout
+                if ("KEYBOARD" == key)
+                    input.changeKeyLayout(_TVDOS.variables.KEYBOARD || "us_qwerty");
             }
         }
     },