diff --git a/src/add-ons/decorators/SATDecorator/StackAndTile.cpp b/src/add-ons/decorators/SATDecorator/StackAndTile.cpp
index f12531c000..081c7e8a43 100644
--- a/src/add-ons/decorators/SATDecorator/StackAndTile.cpp
+++ b/src/add-ons/decorators/SATDecorator/StackAndTile.cpp
@@ -171,7 +171,7 @@ StackAndTile::WindowMoved(Window* window)
 	if (!satWindow)
 		return;
 
-	if (SATKeyPressed())
+	if (SATKeyPressed() && fCurrentSATWindow)
 		satWindow->FindSnappingCandidates();
 	else
 		satWindow->DoGroupLayout();
@@ -185,7 +185,7 @@ StackAndTile::WindowResized(Window* window)
 	if (!satWindow)
 		return;
 
-	if (SATKeyPressed())
+	if (SATKeyPressed() && fCurrentSATWindow)
 		satWindow->FindSnappingCandidates();
 	else {
 		satWindow->DoGroupLayout();