diff --git a/client.c b/client.c
index c6a60a4db..5f99d95a7 100644
--- a/client.c
+++ b/client.c
@@ -531,9 +531,10 @@ client_stack_refresh()
     uint32_t config_win_vals[2];
     layer_t layer;
 
-    if (!globalconf.client_need_stack_refresh)
+    if (!client_need_stack_refresh)
         return;
-    globalconf.client_need_stack_refresh = false;
+
+    client_need_stack_refresh = false;
 
     config_win_vals[0] = XCB_NONE;
     config_win_vals[1] = XCB_STACK_MODE_ABOVE;
diff --git a/client.h b/client.h
index a270a651c..61e25a4fa 100644
--- a/client.h
+++ b/client.h
@@ -206,10 +206,11 @@ void client_ignore_enterleave_events(void);
 void client_restore_enterleave_events(void);
 void client_class_setup(lua_State *);
 
+bool client_need_stack_refresh;
 static inline void
 client_stack(void)
 {
-    globalconf.client_need_stack_refresh = true;
+    client_need_stack_refresh = true;
 }
 
 /** Put client on top of the stack.
diff --git a/globalconf.h b/globalconf.h
index 01ece7af0..80d40bc96 100644
--- a/globalconf.h
+++ b/globalconf.h
@@ -98,8 +98,6 @@ typedef struct
     int mousegrabber;
     /** Focused screen */
     screen_t *screen_focus;
-    /** Need to call client_stack_refresh() */
-    bool client_need_stack_refresh;
     /** Wiboxes */
     wibox_array_t wiboxes;
     /** The startup notification display struct */