diff --git a/src/w32console.c b/src/w32console.c
index c2b87928cc1..0936b5f37e6 100644
--- a/src/w32console.c
+++ b/src/w32console.c
@@ -705,6 +705,10 @@ initialize_w32_display (struct terminal *term, int *width, int *height)
   /* Remember original console settings.  */
   keyboard_handle = GetStdHandle (STD_INPUT_HANDLE);
   GetConsoleMode (keyboard_handle, &prev_console_mode);
+  /* Make sure ENABLE_EXTENDED_FLAGS is set in console settings,
+     otherwise restoring the original setting of ENABLE_MOUSE_INPUT
+     will not work.  */
+  prev_console_mode |= ENABLE_EXTENDED_FLAGS;
 
   prev_screen = GetStdHandle (STD_OUTPUT_HANDLE);
 
diff --git a/src/w32term.c b/src/w32term.c
index 6dae118108e..281ce3c663a 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -776,12 +776,13 @@ w32_buffer_flipping_unblocked_hook (struct frame *f)
 
 /* Flip buffers on F if drawing has happened.  This function is not
    called to flush the display connection of a frame (which doesn't
-   exist on MS Windows), but also called in some situations in
+   exist on MS Windows), but is called in some situations in
    minibuf.c to make the contents of the back buffer visible.  */
 void
 w32_flip_buffers_if_dirty (struct frame *f)
 {
-  if (FRAME_OUTPUT_DATA (f)->paint_buffer
+  if (FRAME_W32_P (f)	/* do nothing in TTY frames */
+      && FRAME_OUTPUT_DATA (f)->paint_buffer
       && FRAME_OUTPUT_DATA (f)->paint_buffer_dirty
       && !f->garbaged && !buffer_flipping_blocked_p ())
     w32_show_back_buffer (f);