diff --git a/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java b/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java
index cb4af1bc77c1..3943c5b9995e 100644
--- a/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java
+++ b/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java
@@ -3216,7 +3216,7 @@ public class JBTabsImpl extends JComponent
       myDropInfo = null;
       myShowDropLocation = true;
       setDropInfoIndex(-1);
-      if (getTabs().contains(dropInfo)) {
+      if (!isDisposed()) {
         removeTab(dropInfo, null, false, true);
       }
     }