diff --git a/ChangeLog b/ChangeLog
index 252d22cc10..a0cf0ce8f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-09  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkevents-win32.c (doesnt_want_scroll): Look at both
+	GDK_SCROLL_MASK and GDK_BUTTON_PRESS_MASK. (#139628)
+
 2006-05-09  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Add a :cursor-position
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 252d22cc10..a0cf0ce8f6 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-05-09  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkevents-win32.c (doesnt_want_scroll): Look at both
+	GDK_SCROLL_MASK and GDK_BUTTON_PRESS_MASK. (#139628)
+
 2006-05-09  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Add a :cursor-position
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index 3683bc3a57..a6db62f952 100644
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -1801,11 +1801,12 @@ static gboolean
 doesnt_want_scroll (gint mask,
 		    MSG *msg)
 {
-#if 0
-  return !(mask & GDK_SCROLL_MASK);
-#else
-  return !(mask & GDK_BUTTON_PRESS_MASK);
-#endif
+  /* As there are no separate scroll events in X11, button press
+   * events are used, so higher level code might be selecting for
+   * either GDK_BUTTON_PRESS_MASK or GDK_SCROLL_MASK when it wants GDK
+   * scroll events. Make sure this works in the Win32 backend, too.
+   */
+  return !(mask & (GDK_SCROLL_MASK|GDK_BUTTON_PRESS_MASK));
 }
 
 static void