diff --git a/platform/platform-impl/src/com/intellij/ui/content/impl/TabbedContentImpl.java b/platform/platform-impl/src/com/intellij/ui/content/impl/TabbedContentImpl.java
index 1ca84e6339c0..215ddf38af71 100644
--- a/platform/platform-impl/src/com/intellij/ui/content/impl/TabbedContentImpl.java
+++ b/platform/platform-impl/src/com/intellij/ui/content/impl/TabbedContentImpl.java
@@ -184,7 +184,12 @@ public class TabbedContentImpl extends ContentImpl implements TabbedContent {
       ContentUtilEx.addTabbedContent(manager, component, prefix, tabName, select);
     }
     setShouldDisposeContent(false);
-    Disposer.dispose(this);
+    try {
+      Disposer.dispose(this);
+    }
+    finally {
+      setShouldDisposeContent(true);
+    }
   }
 
   @Override