diff --git a/ChangeLog b/ChangeLog
index af92479ed..06099c68f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-01  Padraig O'Briain  <padraig.obriain@sun.com>
+
+	* src/keybindings.c (process_tab_grab): Activate window before ending
+	grab. This fixes bug #114037.
+
 2003-06-20  Rob Adams  <robadams@ucla.edu>
 
 	* src/window.c (meta_window_unmaximize): Update grab state when we
diff --git a/src/keybindings.c b/src/keybindings.c
index 50fc8d2c5..0b2eb6671 100644
--- a/src/keybindings.c
+++ b/src/keybindings.c
@@ -2201,10 +2201,6 @@ process_tab_grab (MetaDisplay *display,
       
       if (target_window)
         {
-          meta_topic (META_DEBUG_KEYBINDINGS,
-                      "Ending grab early so we can focus the target window\n");
-          meta_display_end_grab_op (display, event->xkey.time);
-
           meta_topic (META_DEBUG_KEYBINDINGS,
                       "Activating target window\n");
 
@@ -2212,6 +2208,10 @@ process_tab_grab (MetaDisplay *display,
                       target_window->desc);
           meta_window_activate (target_window, event->xkey.time);
 
+          meta_topic (META_DEBUG_KEYBINDINGS,
+                      "Ending grab early so we can focus the target window\n");
+          meta_display_end_grab_op (display, event->xkey.time);
+
           return TRUE; /* we already ended the grab */
         }