diff --git a/src/keyboard.c b/src/keyboard.c
index 282ce450297..53517e377c9 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1036,7 +1036,7 @@ cmd_error_internal (data, context)
 	 running under a window system.  */
       || (!NILP (Vwindow_system)
 	  && !inhibit_window_system
-	  && !FRAME_WINDOW_P (selected_frame))
+	  && FRAME_TERMCAP_P (selected_frame))
       || noninteractive)
     {
       stream = Qexternal_debugging_output;