diff --git a/glob/manager_server.py b/glob/manager_server.py
index b0056938..e2b2096d 100644
--- a/glob/manager_server.py
+++ b/glob/manager_server.py
@@ -1599,11 +1599,11 @@ def restart(self):
     if '--windows-standalone-build' in sys_argv:
         sys_argv.remove('--windows-standalone-build')
 
-    if sys.platform.startswith('win32'):
-        cmds = ['"' + sys.executable + '"', '"' + sys_argv[0] + '"'] + sys_argv[1:]
-    elif sys_argv[0].endswith("__main__.py"):  # this is a python module
+    if sys_argv[0].endswith("__main__.py"):  # this is a python module
         module_name = os.path.basename(os.path.dirname(sys_argv[0]))
         cmds = [sys.executable, '-m', module_name] + sys_argv[1:]
+    elif sys.platform.startswith('win32'):
+        cmds = ['"' + sys.executable + '"', '"' + sys_argv[0] + '"'] + sys_argv[1:]
     else:
         cmds = [sys.executable] + sys_argv
 
diff --git a/prestartup_script.py b/prestartup_script.py
index 71900969..4a299c12 100644
--- a/prestartup_script.py
+++ b/prestartup_script.py
@@ -816,11 +816,11 @@ if script_executed:
     else:
         sys_argv = sys.argv.copy()
 
-        if sys.platform.startswith('win32'):
-            cmds = ['"' + sys.executable + '"', '"' + sys_argv[0] + '"'] + sys_argv[1:]
-        elif sys_argv[0].endswith("__main__.py"):  # this is a python module
+        if sys_argv[0].endswith("__main__.py"):  # this is a python module
             module_name = os.path.basename(os.path.dirname(sys_argv[0]))
             cmds = [sys.executable, '-m', module_name] + sys_argv[1:]
+        elif sys.platform.startswith('win32'):
+            cmds = ['"' + sys.executable + '"', '"' + sys_argv[0] + '"'] + sys_argv[1:]
         else:
             cmds = [sys.executable] + sys_argv