diff --git a/awesome.c b/awesome.c
index 4ab72586..6b7726f1 100644
--- a/awesome.c
+++ b/awesome.c
@@ -78,8 +78,8 @@ awesome_atexit(bool restart)
     lua_pushboolean(L, restart);
     signal_object_emit(L, &global_signals, "exit", 1);
 
-    /* Move clients where we want them to be */
-    foreach(c, globalconf.clients)
+    /* Move clients where we want them to be and keep the stacking order intact */
+    foreach(c, globalconf.stack)
     {
         xcb_reparent_window(globalconf.connection, (*c)->window, globalconf.screen->root,
                 (*c)->geometry.x, (*c)->geometry.y);