diff --git a/src/ChangeLog b/src/ChangeLog
index fb4bd4de1ccf8c8a01c70097ada68fdf0dd576d1..4cb7383144d054e7bfdee820e654c32b9401c0c8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-20  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* gtkutil.c (xg_event_is_for_scrollbar): Check if grabbed
+	widget is a scrollbar.
+
 2010-04-20  Kenichi Handa  <handa@m17n.org>
 
 	* charset.c (char_charset): Consider Vcharset_non_preferred_head
diff --git a/src/gtkutil.c b/src/gtkutil.c
index c2b425b4562d7d6a1fc86d17c05bf62d025a6f21..b3805511bc9c77b13ac89c37dcf6082c604bf36e 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -3371,8 +3371,8 @@ xg_event_is_for_scrollbar (f, event)
                || event->type == MotionNotify))
     {
       /* If we are releasing or moving the scroll bar, it has the grab.  */
-      retval = gtk_grab_get_current () != 0
-        && gtk_grab_get_current () != f->output_data.x->edit_widget;
+      GtkWidget *w = gtk_grab_get_current ();
+      retval = w != 0 && GTK_IS_SCROLLBAR (w);
     }
   
   return retval;