diff --git a/CHANGES b/CHANGES
index e8620e2c6..5f123fa61 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,7 @@ CHANGES IN FLTK 1.1.7
 	- Documentation fixes (STR #571, STR #648, STR #692, STR
 	  #730, STR #744, STR #745, STR #931, STR #942, STR #960,
 	  STR #969)
+	- Fixed unnecessary delay in WIN32 event handling (STR #1104)
 	- Fixed handling of Crl-C in Fl_Text_Display (STR #1122)
 	- OS X Quartz version now draw a nice resize control (STR
 	  #1099)
diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx
index 8b21fe0e3..36372b296 100644
--- a/src/Fl_win32.cxx
+++ b/src/Fl_win32.cxx
@@ -257,7 +257,8 @@ int fl_wait(double time_to_wait) {
   }
 #endif // USE_ASYNC_SELECT
 
-  if (Fl::idle) time_to_wait = 0.0;
+  if (Fl::idle || Fl::damage()) 
+    time_to_wait = 0.0;
 
   fl_unlock_function();