diff --git a/snowberry/plugins/launcher.py b/snowberry/plugins/launcher.py
index db8957b8ef..5dcfe4a99a 100644
--- a/snowberry/plugins/launcher.py
+++ b/snowberry/plugins/launcher.py
@@ -256,7 +256,10 @@ def q2p(s): return '\\\\\\\"' + s + '\\\\\\\"'
     else:
         spawnFunc = os.spawnvp
 
-    spawnFunc(os.P_NOWAIT, engineBin, [engineBin, '@' + responseFile])
+    if host.isWindows():
+        spawnFunc(os.P_NOWAIT, engineBin, [engineBin, '@' + paths.quote(responseFile)])
+    else:
+        spawnFunc(os.P_NOWAIT, engineBin, [engineBin, '@' + responseFile])
 
     # Shut down if the configuration settings say so.
     value = profile.getValue('quit-on-launch')
@@ -267,15 +270,8 @@ def q2p(s): return '\\\\\\\"' + s + '\\\\\\\"'
 
 def spawnWithTerminal(wait, launchScript, arguments):
     term = st.getSystemString('system-terminal').split(' ')
-    #print term + [launchScript]
     subprocess.Popen(term + [launchScript])
 
-    #if host.isWindows():
-    #    spawn = os.spawnv
-    #else:
-    #    spawn = os.spawnvp
-    #spawn(wait, term[0], term + [launchScript])    
-
 
 def generateOptions(profile):
     """Generate a text string of all the command line options used