2 files changed, 6 insertions, 3 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index 13bf7131e0e..016582d8d20 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -10584,8 +10584,9 @@ See also `current-input-mode'.  */)
 #endif
 
 #ifndef DOS_NT
-  /* this causes startup screen to be restored and messes with the mouse */
-  reset_all_sys_modes ();
+  if (FRAME_TERMCAP_P (XFRAME (selected_frame)))
+    /* this causes startup screen to be restored and messes with the mouse */
+    reset_sys_modes (CURTTY ());
 #endif
 
 #ifdef SIGIO
@@ -10628,7 +10629,8 @@ See also `current-input-mode'.  */)
     quit_char = XINT (quit) & (NILP (meta) ? 0177 : 0377);
 
 #ifndef DOS_NT
-  init_all_sys_modes ();
+  if (FRAME_TERMCAP_P (XFRAME (selected_frame)))
+    init_sys_modes (CURTTY ());
 #endif
 
 #ifdef POLL_FOR_INPUT
diff --git a/src/sysdep.c b/src/sysdep.c
index 4127517b98f..56dae99dc9f 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -1725,6 +1725,7 @@ nil means don't delete them until `list-processes' is run.  */);
 
   if (tty_out->term_initted && no_redraw_on_reenter)
     {
+      /* XXX This seems wrong on multi-tty. */
       if (display_completed)
         direct_output_forward_char (0);
     }