diff --git a/src/appicon.c b/src/appicon.c
index 0a5d6e6d..4ccd3a42 100644
--- a/src/appicon.c
+++ b/src/appicon.c
@@ -875,7 +875,7 @@ Bool wHandleAppIconMove(WAppIcon *aicon, XEvent *event)
 			wAppIconMove(aicon, x, y);
 
 			WDock *theNewDock = NULL;
-			if (!(ev.xmotion.state & MOD_MASK) || aicon->launching || aicon->lock) {
+			if (!(ev.xmotion.state & MOD_MASK) || aicon->launching || aicon->lock || originalDock == NULL) {
 				for (i = 0; dockable && i < scr->drawer_count + 2; i++) {
 					WDock *theDock = allDocks[i];
 					if (theDock == NULL)