diff --git a/Src/builtin.c b/Src/builtin.c
index 407cad159..3dab3f9b4 100644
--- a/Src/builtin.c
+++ b/Src/builtin.c
@@ -6119,7 +6119,7 @@ bin_emulate(char *nam, char **argv, Options ops, UNUSED(int func))
     savehackchar = keyboardhackchar;
     emulate(shname, opt_R, &new_emulation, new_opts);
     optlist = newlinklist();
-    if (parseopts(nam, &argv, new_opts, &cmd, optlist, 0)) {
+    if (parseopts(nam, &argv, new_opts, &cmd, optlist, 0, NULL)) {
 	ret = 1;
 	goto restore;
     }
diff --git a/Src/init.c b/Src/init.c
index 04a5856ff..3d6c94d04 100644
--- a/Src/init.c
+++ b/Src/init.c
@@ -248,7 +248,8 @@ static int restricted;
 
 /**/
 static void
-parseargs(char *zsh_name, char **argv, char **runscript, char **cmdptr)
+parseargs(char *zsh_name, char **argv, char **runscript, char **cmdptr,
+	  int *needkeymap)
 {
     char **x;
     LinkList paramlist;
@@ -265,7 +266,7 @@ parseargs(char *zsh_name, char **argv, char **runscript, char **cmdptr)
      * matched by code at the end of the present function.
      */
 
-    if (parseopts(zsh_name, &argv, opts, cmdptr, NULL, flags))
+    if (parseopts(zsh_name, &argv, opts, cmdptr, NULL, flags, needkeymap))
 	exit(1);
 
     /*
@@ -376,7 +377,7 @@ static void parseopts_setemulate(char *nam, int flags)
 /**/
 mod_export int
 parseopts(char *nam, char ***argvp, char *new_opts, char **cmdp,
-	  LinkList optlist, int flags)
+	  LinkList optlist, int flags, int *needkeymap)
 {
     int optionbreak = 0;
     int action, optno;
@@ -482,8 +483,14 @@ parseopts(char *nam, char ***argvp, char *new_opts, char **cmdp,
 		    return 1;
 		} else if (optno == RESTRICTED && toplevel) {
 		    restricted = action;
-		} else if ((optno == EMACSMODE || optno == VIMODE) && !toplevel) {
-		    WARN_OPTION("can't change option: %s", *argv);
+		} else if ((optno == EMACSMODE || optno == VIMODE)
+			   && (!toplevel || needkeymap)){
+		    if (!toplevel) {
+			WARN_OPTION("can't change option: %s", *argv);
+		    } else {
+			/* Need to wait for modules to be loadable */
+			*needkeymap = optno;
+		    }
 		} else {
 		    if (dosetopt(optno, action, toplevel, new_opts) &&
 			!toplevel) {
@@ -1707,7 +1714,7 @@ zsh_main(UNUSED(int argc), char **argv)
 {
     char **t, *runscript = NULL, *zsh_name;
     char *cmd;			/* argument to -c */
-    int t0;
+    int t0, needkeymap = 0;
 #ifdef USE_LOCALE
     setlocale(LC_ALL, "");
 #endif
@@ -1753,7 +1760,7 @@ zsh_main(UNUSED(int argc), char **argv)
     createoptiontable();
     /* sets emulation, LOGINSHELL, PRIVILEGED, ZLE, INTERACTIVE,
      * SHINSTDIN and SINGLECOMMAND */ 
-    parseargs(zsh_name, argv, &runscript, &cmd);
+    parseargs(zsh_name, argv, &runscript, &cmd, &needkeymap);
 
     SHTTY = -1;
     init_io(cmd);
@@ -1762,6 +1769,15 @@ zsh_main(UNUSED(int argc), char **argv)
     init_signals();
     init_bltinmods();
     init_builtins();
+
+    if (needkeymap)
+    {
+	/* Saved for after module system initialisation */
+	zleentry(ZLE_CMD_SET_KEYMAP, needkeymap);
+	opts[needkeymap] = 1;
+	opts[needkeymap == EMACSMODE ? VIMODE : EMACSMODE] = 0;
+    }
+
     run_init_scripts();
     setupshin(runscript);
     init_misc(cmd, zsh_name);