diff --git a/README.multi-tty b/README.multi-tty
index d1122dfba83..39a1607cbde 100644
--- a/README.multi-tty
+++ b/README.multi-tty
@@ -40,6 +40,7 @@ Ami Fischman <ami at fischman dot org>
 Friedrich Delgado Friedrichs <friedel at nomaden dot org>
 IRIE Tetsuya <irie at t dot email dot ne dot jp>
 Yoshiaki Kasahara <kasahara at nc dot kyushu-u dot ac dot jp>
+Bas Kok <nekkobassu at yahoo dot com>
 Jurej Kubelka <Juraj dot Kubelka at email dot cz>
 David Lichteblau <david at lichteblau dot com>
 Xavier Mallard <zedek at gnu-rox dot org>
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index ecd0d18ce85..85415eba44a 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -179,9 +179,9 @@ decode_options (argc, argv)
   else
     tty = 1;
 
-  /* `emacsclient --no-wait' should open a new permanent frame, then exit.
-     Otherwise, --no-wait always implies --current-frame.  */
-  if (nowait && argc - optind > 0)
+  /* --no-wait implies --current-frame on ttys when there are file
+       arguments or expressions given.  */
+  if (nowait && tty && argc - optind > 0)
     current_frame = 1;
 
   if (current_frame)