diff --git a/ChangeLog b/ChangeLog
index e892b71b6..6fc5a1080 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-04  Havoc Pennington  <hp@pobox.com>
+
+	* src/display.c (event_callback): don't lower docks when a grab
+	causes them to get LeaveNotify
+
 2002-01-04  Havoc Pennington  <hp@pobox.com>
 
 	* src/screen.c (meta_screen_free): set event mask on root window
diff --git a/src/display.c b/src/display.c
index 1c2a71333..b98a0e809 100644
--- a/src/display.c
+++ b/src/display.c
@@ -873,7 +873,9 @@ event_callback (XEvent   *event,
               break;
             }
           
-          if (window->type == META_WINDOW_DOCK)
+          if (window->type == META_WINDOW_DOCK &&
+              event->xcrossing.mode != NotifyGrab &&
+              event->xcrossing.mode != NotifyUngrab)
             meta_window_lower (window);
         }
       break;