diff --git a/windows/pterm.c b/windows/pterm.c
index 0df849f9..bb68245d 100644
--- a/windows/pterm.c
+++ b/windows/pterm.c
@@ -1,6 +1,10 @@
 #include "putty.h"
 #include "storage.h"
 
+const unsigned cmdline_tooltype =
+    TOOLTYPE_NONNETWORK |
+    TOOLTYPE_NO_VERBOSE_OPTION;
+
 void gui_term_process_cmdline(Conf *conf, char *cmdline)
 {
     do_defaults(NULL, conf);
@@ -16,8 +20,16 @@ void gui_term_process_cmdline(Conf *conf, char *cmdline)
     split_into_argv(cmdline, &argc, &argv, &argstart);
 
     for (int i = 0; i < argc; i++) {
-        const char *arg = argv[i];
-        if (!strcmp(arg, "-e")) {
+        char *arg = argv[i];
+        int retd = cmdline_process_param(
+            arg, i+1<argc?argv[i+1]:NULL, 1, conf);
+        if (retd == -2) {
+            cmdline_error("option \"%s\" requires an argument", arg);
+        } else if (retd == 2) {
+            i++;               /* skip next argument */
+        } else if (retd == 1) {
+            continue;          /* nothing further needs doing */
+        } else if (!strcmp(arg, "-e")) {
             if (i+1 < argc) {
                 /* The command to execute is taken to be the unparsed
                  * version of the whole remainder of the command line. */
@@ -33,6 +45,8 @@ void gui_term_process_cmdline(Conf *conf, char *cmdline)
         }
     }
 
+    cmdline_run_saved(conf);
+
     conf_set_int(conf, CONF_sharrow_type, SHARROW_BITMAP);
 }
 
diff --git a/windows/putty.c b/windows/putty.c
index 83594d61..efb490fa 100644
--- a/windows/putty.c
+++ b/windows/putty.c
@@ -6,6 +6,11 @@ extern const char *dialog_box_demo_screenshot_filename;
 static strbuf *demo_terminal_data = NULL;
 static const char *terminal_demo_screenshot_filename;
 
+const unsigned cmdline_tooltype =
+    TOOLTYPE_HOST_ARG |
+    TOOLTYPE_PORT_ARG |
+    TOOLTYPE_NO_VERBOSE_OPTION;
+
 void gui_term_process_cmdline(Conf *conf, char *cmdline)
 {
     char *p;
diff --git a/windows/window.c b/windows/window.c
index 4b1e4f05..0a71dcf1 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -520,11 +520,6 @@ char *terminal_window_class_a(void)
     return classname;
 }
 
-const unsigned cmdline_tooltype =
-    TOOLTYPE_HOST_ARG |
-    TOOLTYPE_PORT_ARG |
-    TOOLTYPE_NO_VERBOSE_OPTION;
-
 HINSTANCE hinst;
 
 int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)