diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/Stripe.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/Stripe.java
index 04566cde39cb..2589418209a7 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/Stripe.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/Stripe.java
@@ -489,7 +489,7 @@ final class Stripe extends JPanel{
   }
 
   public void finishDrop() {
-    if (myLastLayoutData == null) return;
+    if (myLastLayoutData == null || !isDroppingButton()) return;
 
     final WindowInfoImpl info = myDragButton.getDecorator().getWindowInfo();
     myFinishingDrop = true;