diff --git a/basis/editors/emacs/windows/windows.factor b/basis/editors/emacs/windows/windows.factor
index d5c1e7811c..e18c39ed60 100755
--- a/basis/editors/emacs/windows/windows.factor
+++ b/basis/editors/emacs/windows/windows.factor
@@ -1,9 +1,12 @@
 ! Copyright (C) 2009 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: editors.emacs io.directories.search.windows kernel sequences
-system ;
+system combinators.short-circuit ;
 IN: editors.emacs.windows
 
 M: windows default-emacsclient
-    "Emacs" t [ "emacsclient.exe" tail? ] find-in-program-files
-    "emacsclient.exe" or ;
+    {
+        [ "Emacs" t [ "emacsclientw.exe" tail? ] find-in-program-files ]
+        [ "Emacs" t [ "emacsclient.exe" tail? ] find-in-program-files ]
+        [ "emacsclient.exe" ]
+    } 0|| ;