diff --git a/src/os_win32.c b/src/os_win32.c
index 844b70a..bfd5f4a 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -232,6 +232,8 @@
 
 static char_u *exe_path = NULL;
 
+static BOOL win8_or_later = FALSE;
+
 /*
  * Version of ReadConsoleInput() that works with IME.
  * Works around problems on Windows 8.
@@ -252,6 +254,13 @@
     static DWORD s_dwMax = 0;
     DWORD dwEvents;
 
+    if (!win8_or_later)
+    {
+	if (nLength == -1)
+	    return PeekConsoleInput(hInput, lpBuffer, 1, lpEvents);
+	return ReadConsoleInput(hInput, lpBuffer, 1, &dwEvents);
+    }
+
     if (s_dwMax == 0)
     {
 	if (nLength == -1)
@@ -617,6 +626,10 @@
 
 	g_PlatformId = ovi.dwPlatformId;
 
+	if ((ovi.dwMajorVersion == 6 && ovi.dwMinorVersion >= 2)
+		|| ovi.dwMajorVersion > 6)
+	    win8_or_later = TRUE;
+
 #ifdef HAVE_ACL
 	/*
 	 * Load the ADVAPI runtime if we are on anything