diff --git a/basis/editors/emacs/emacs.factor b/basis/editors/emacs/emacs.factor
index a8e6d23ecf..051f7c1bfb 100644
--- a/basis/editors/emacs/emacs.factor
+++ b/basis/editors/emacs/emacs.factor
@@ -23,9 +23,7 @@ M: windows find-emacsclient
 M: emacsclient editor-command ( file line -- command )
     [
         emacsclient-path get [ find-emacsclient ] unless* ,
-        emacsclient-args get %
-        "-a=emacs" ,
-        "--no-wait" ,
+        emacsclient-args get [ { "-a=emacs" "--no-wait" } ] unless* %
         number>string "+" prepend ,
         ,
     ] { } make ;