diff --git a/ChangeLog b/ChangeLog
index 54ed44d8e..11b8f9c5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2003-02-28  Mark McLoughlin  <mark@skynet.ie>
+
+	Give me back my keys.
+
+	* src/keybindings.c: (meta_window_grab_keys): don't
+	grab keys on DOCK windows.
+
+	* src/window.c: (recalc_window_type): re-grab the
+	keys.
+
 2003-02-26  Dmitry G. Mastrukov  <dmitry@taurussoft.org>
 
 	* configure.in: Added Belarusian to ALL_LINGUAS.
diff --git a/src/keybindings.c b/src/keybindings.c
index 925ea3152..e1fc24cdc 100644
--- a/src/keybindings.c
+++ b/src/keybindings.c
@@ -1080,6 +1080,14 @@ meta_window_grab_keys (MetaWindow  *window)
 {
   if (window->all_keys_grabbed)
     return;
+
+  if (window->type == META_WINDOW_DOCK)
+    {
+      if (window->keys_grabbed)
+        ungrab_all_keys (window->display, window->xwindow);
+      window->keys_grabbed = FALSE;
+      return;
+    }
   
   if (window->keys_grabbed)
     {
diff --git a/src/window.c b/src/window.c
index 2b0839bdc..62c48c184 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5370,6 +5370,8 @@ recalc_window_type (MetaWindow *window)
       
       /* update stacking constraints */
       meta_window_update_layer (window);
+
+      meta_window_grab_keys (window);
     }
 }