diff --git a/objects/client.c b/objects/client.c
index b6e33a31a..54ee4b273 100644
--- a/objects/client.c
+++ b/objects/client.c
@@ -272,7 +272,7 @@ client_unfocus(client_t *c)
      * the WM_TAKE_FOCUS protocol.
      */
     xcb_set_input_focus(globalconf.connection, XCB_INPUT_FOCUS_PARENT,
-                        root_win, XCB_CURRENT_TIME);
+                        root_win, globalconf.timestamp);
 
     client_unfocus_update(c);
 }
@@ -301,7 +301,7 @@ client_set_focus(client_t *c, bool set_input_focus)
     bool takefocus = client_hasproto(c, WM_TAKE_FOCUS);
     if(set_input_focus)
         xcb_set_input_focus(globalconf.connection, XCB_INPUT_FOCUS_PARENT,
-                            c->window, XCB_CURRENT_TIME);
+                            c->window, globalconf.timestamp);
     if(takefocus)
         xwindow_takefocus(c->window);
 }
@@ -1119,7 +1119,7 @@ client_kill(client_t *c)
         ev.response_type = XCB_CLIENT_MESSAGE;
         ev.window = c->window;
         ev.format = 32;
-        ev.data.data32[1] = XCB_CURRENT_TIME;
+        ev.data.data32[1] = globalconf.timestamp;
         ev.type = WM_PROTOCOLS;
         ev.data.data32[0] = WM_DELETE_WINDOW;
 
diff --git a/selection.c b/selection.c
index 443d20fcb..527ec40ca 100644
--- a/selection.c
+++ b/selection.c
@@ -52,7 +52,7 @@ luaA_selection_get(lua_State *L)
     }
 
     xcb_convert_selection(globalconf.connection, selection_window,
-                          XCB_ATOM_PRIMARY, UTF8_STRING, XSEL_DATA, XCB_CURRENT_TIME);
+                          XCB_ATOM_PRIMARY, UTF8_STRING, XSEL_DATA, globalconf.timestamp);
     xcb_flush(globalconf.connection);
 
     xcb_generic_event_t *event;
diff --git a/spawn.c b/spawn.c
index e476e9a85..0728047c1 100644
--- a/spawn.c
+++ b/spawn.c
@@ -334,7 +334,7 @@ luaA_spawn(lua_State *L)
         sn_launcher_context_set_name(context, "awesome");
         sn_launcher_context_set_description(context, "awesome spawn");
         sn_launcher_context_set_binary_name(context, cmdname);
-        sn_launcher_context_initiate(context, "awesome", cmdname, XCB_CURRENT_TIME);
+        sn_launcher_context_initiate(context, "awesome", cmdname, globalconf.timestamp);
         p_delete(&cmdname);
 
         /* app will have AWESOME_SPAWN_TIMEOUT seconds to complete,
diff --git a/xwindow.c b/xwindow.c
index 6cb3b6bc3..78a0b4d85 100644
--- a/xwindow.c
+++ b/xwindow.c
@@ -223,7 +223,7 @@ xwindow_takefocus(xcb_window_t win)
     ev.response_type = XCB_CLIENT_MESSAGE;
     ev.window = win;
     ev.format = 32;
-    ev.data.data32[1] = XCB_CURRENT_TIME;
+    ev.data.data32[1] = globalconf.timestamp;
     ev.type = WM_PROTOCOLS;
     ev.data.data32[0] = WM_TAKE_FOCUS;