diff --git a/gvim-wrapper.py b/gvim-wrapper.py
index 5c31e04..bce9d9d 100644
--- a/gvim-wrapper.py
+++ b/gvim-wrapper.py
@@ -55,7 +55,7 @@ def main(argv):
     fname = ' '.join(argv[1:])
     servername = get_server_name(config, fname)
     os.execv(config['vimdir'] + '\\gvim.exe',
-            ['gvim', '--servername', servername, '--remote-tab-silent', '"' + fname + '"'])
+            ['gvim', '--servername', '"%s"' % servername, '--remote-tab-silent', '"' + fname + '"'])
 
 if __name__ == '__main__':
     sys.exit(main(sys.argv))