diff --git a/src/ftxui/component/screen_interactive.cpp b/src/ftxui/component/screen_interactive.cpp
index 3a1e4c88..3eea128c 100644
--- a/src/ftxui/component/screen_interactive.cpp
+++ b/src/ftxui/component/screen_interactive.cpp
@@ -101,44 +101,41 @@ void ScreenInteractive::EventLoop(Component* component) {
 void ScreenInteractive::Loop(Component* component) {
   // Install a SIGINT handler and restore the old handler on exit.
   install_signal_handler(SIGINT, OnExit);
-  // Handle resize.
-  install_signal_handler(SIGWINCH, OnResize);
 
   // Save the old terminal configuration and restore it on exit.
 #ifdef WIN32
-  // some special utf8 dance needed.
-  SetConsoleOutputCP(CP_UTF8);
-  setvbuf(stdout, nullptr, _IONBF, 0);
+  // Enable VT processing on stdout and stdin
+  auto stdout_handle = GetStdHandle(STD_OUTPUT_HANDLE);
+  auto stdin_handle = GetStdHandle(STD_INPUT_HANDLE);
 
-  DWORD original_mode = 0;
-  GetConsoleMode(GetStdHandle(STD_OUTPUT_HANDLE), &original_mode);
-  on_exit_functions.push([original_mode]() {
-    SetConsoleMode(GetStdHandle(STD_OUTPUT_HANDLE), original_mode);
-  });
+  DWORD out_mode = 0;
+  DWORD in_mode = 0;
+  GetConsoleMode(stdout_handle, &out_mode);
+  GetConsoleMode(stdin_handle, &in_mode);
+  on_exit_functions.push([=] { SetConsoleMode(stdout_handle, out_mode); });
+  on_exit_functions.push([=] { SetConsoleMode(stdin_handle, in_mode); });
 
-  DWORD mode = original_mode;
-  // disable echo
-  mode &= ~ENABLE_ECHO_INPUT;
-  mode |= ENABLE_VIRTUAL_TERMINAL_INPUT;
-  mode |= ENABLE_VIRTUAL_TERMINAL_PROCESSING;
-  SetConsoleMode(GetStdHandle(STD_OUTPUT_HANDLE), mode);
+  out_mode |= ENABLE_VIRTUAL_TERMINAL_PROCESSING;
+  out_mode |= DISABLE_NEWLINE_AUTO_RETURN;
+
+  in_mode &= ~ENABLE_ECHO_INPUT;
+  in_mode &= ~ENABLE_LINE_INPUT;
+  in_mode |= ENABLE_VIRTUAL_TERMINAL_INPUT;
+  in_mode |= ENABLE_WINDOW_INPUT;
+
+  SetConsoleMode(stdin_handle, in_mode);
+  SetConsoleMode(stdout_handle, out_mode);
 #else
-  struct termios terminal_configuration_old;
-  tcgetattr(STDIN_FILENO, &terminal_configuration_old);
-  on_exit_functions.push(
-      [terminal_configuration_old = terminal_configuration_old]() {
-        tcsetattr(STDIN_FILENO, TCSANOW, &terminal_configuration_old);
-      });
+  // Handle resize.
+  install_signal_handler(SIGWINCH, OnResize);
 
-  // Set the new terminal configuration
-  struct termios terminal_configuration_new;
-  terminal_configuration_new = terminal_configuration_old;
+  struct termios terminal;
+  tcgetattr(STDIN_FILENO, &terminal);
+  on_exit_functions.push([=] { tcsetattr(STDIN_FILENO, TCSANOW, &terminal); });
 
-  // Non canonique terminal.
-  terminal_configuration_new.c_lflag &= ~ICANON;
-  // Do not print after a key press.
-  terminal_configuration_new.c_lflag &= ~ECHO;
-  tcsetattr(STDIN_FILENO, TCSANOW, &terminal_configuration_new);
+  terminal.c_lflag &= ~ICANON;  // Non canonique terminal.
+  terminal.c_lflag &= ~ECHO;    // Do not print after a key press.
+  tcsetattr(STDIN_FILENO, TCSANOW, &terminal);
 #endif
 
   // Hide the cursor and show it at exit.
diff --git a/src/ftxui/screen/screen.cpp b/src/ftxui/screen/screen.cpp
index 651b1c51..c5cf8ffe 100644
--- a/src/ftxui/screen/screen.cpp
+++ b/src/ftxui/screen/screen.cpp
@@ -7,6 +7,12 @@
 #include "ftxui/screen/string.hpp"
 #include "ftxui/screen/terminal.hpp"
 
+#ifdef WIN32
+  #define WIN32_LEAN_AND_MEAN
+  #define NOMINMAX
+  #include <Windows.h>
+#endif
+
 namespace ftxui {
 
 namespace {
@@ -68,7 +74,17 @@ Screen::Screen(int dimx, int dimy)
     : stencil({0, dimx - 1, 0, dimy - 1}),
       dimx_(dimx),
       dimy_(dimy),
-      pixels_(dimy, std::vector<Pixel>(dimx)) {}
+      pixels_(dimy, std::vector<Pixel>(dimx)) {
+#if defined(WIN32)
+  // The placement of this call is a bit weird, however we can assume that
+  // anybody who instantiates a Screen object eventually wants to output
+  // something to the console.
+  // As we require UTF8 for all input/output operations we will just switch to
+  // UTF8 encoding here
+  SetConsoleOutputCP(CP_UTF8);
+  SetConsoleCP(CP_UTF8);
+#endif
+}
 
 void UpdatePixelStyle(std::wstringstream& ss, Pixel& previous, Pixel& next) {
   if (next.bold != previous.bold)