diff --git a/src/dock.c b/src/dock.c
index 3fd3dbe1..8b93a506 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -4448,13 +4448,15 @@ static void drawerDestroy(WDock *drawer)
 
 	wAppIconDestroy(drawer->icon_array[0]);
 	wfree(drawer->icon_array);
-	wfree(drawer);
+	drawer->icon_array = NULL;
 
 	drawerRemoveFromChain(scr, drawer);
 	if (scr->last_dock == drawer)
 		scr->last_dock = NULL;
 	if (scr->attracting_drawer == drawer)
 		scr->attracting_drawer = NULL;
+
+	wfree(drawer);
 }