diff --git a/basis/editors/emacs/emacs.factor b/basis/editors/emacs/emacs.factor
index 1550fccc0b..79387f9820 100644
--- a/basis/editors/emacs/emacs.factor
+++ b/basis/editors/emacs/emacs.factor
@@ -1,11 +1,11 @@
 USING: definitions io.launcher kernel parser words sequences math
-math.parser namespaces editors make ;
+math.parser namespaces editors make system ;
 IN: editors.emacs
 
 : emacsclient ( file line -- )
     [
         \ emacsclient get "emacsclient" or ,
-        "--no-wait" ,
+        os windows? [ "--no-wait" , ] unless
         "+" swap number>string append ,
         ,
     ] { } make try-process ;