diff --git a/gvim-wrapper.py b/gvim-wrapper.py
index f814d80..5c31e04 100644
--- a/gvim-wrapper.py
+++ b/gvim-wrapper.py
@@ -52,10 +52,10 @@ def main(argv):
     if (len(argv) < 2):
         return -1
     read_config_file(config, os.path.expanduser('~/.gvim-wrapper'))
-    for fname in argv[1:]:
-        servername = get_server_name(config, fname)
-        os.execv(config['vimdir'] + '\\gvim.exe',
-                ['gvim', '--servername', servername, '--remote-tab-silent', fname])
+    fname = ' '.join(argv[1:])
+    servername = get_server_name(config, fname)
+    os.execv(config['vimdir'] + '\\gvim.exe',
+            ['gvim', '--servername', servername, '--remote-tab-silent', '"' + fname + '"'])
 
 if __name__ == '__main__':
     sys.exit(main(sys.argv))