diff --git a/src/focus.c b/src/focus.c
index 1cb30dfe3414b25834ca4b30d7e99b49c170fa1f..901aa7c008b47a421766691593c3d62ce8dd01ae 100644
--- a/src/focus.c
+++ b/src/focus.c
@@ -480,7 +480,7 @@ clientSetFocus (ScreenInfo *screen_info, Client * c, Time timestamp, unsigned sh
         }
         XChangeProperty (myScreenGetXDisplay (screen_info), screen_info->xroot, net_active_window, XA_WINDOW, 32,
                          PropModeReplace, (unsigned char *) data, 2);
-        XSetInputFocus (myScreenGetXDisplay (screen_info), screen_info->gnome_win, RevertToPointerRoot, CurrentTime);
+        XSetInputFocus (myScreenGetXDisplay (screen_info), screen_info->gnome_win, RevertToPointerRoot, timestamp);
     }
 }