diff --git a/extra/editors/gvim/gvim.factor b/extra/editors/gvim/gvim.factor
index d26bd70209..024f5cfffa 100644
--- a/extra/editors/gvim/gvim.factor
+++ b/extra/editors/gvim/gvim.factor
@@ -4,11 +4,7 @@ IN: editors.gvim
 TUPLE: gvim ;
 
 M: gvim vim-command ( file line -- string )
-    [
-        "\"" % vim-path get % "\"" %
-        vim-switches get [ % ] when*
-        "+" % # " \"" % % "\"" %
-    ] "" make ;
+    [ "\"" % vim-path get % "\" \"" % swap % "\" +" % # ] "" make ;
 
 T{ gvim } vim-editor set-global
 "gvim" vim-path set-global