diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.kt b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.kt
index d3b3174f8c9e..a704d2f28707 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.kt
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.kt
@@ -1019,11 +1019,13 @@ open class ToolWindowManagerImpl(val project: Project) : ToolWindowManagerEx(),
 
   private fun removeDecoratorWithoutUpdatingState(entry: ToolWindowEntry, info: WindowInfoImpl, dirtyMode: Boolean) {
     entry.windowedDecorator?.let {
+      entry.windowedDecorator = null
       Disposer.dispose(it)
       return
     }
 
     entry.floatingDecorator?.let {
+      entry.floatingDecorator = null
       it.dispose()
       return
     }
@@ -1043,7 +1045,6 @@ open class ToolWindowManagerImpl(val project: Project) : ToolWindowManagerEx(),
 
     entry.windowedDecorator?.let { windowedDecorator ->
       info.isActiveOnStart = windowedDecorator.isActive
-      entry.windowedDecorator = null
       val frame = windowedDecorator.getFrame()
       if (frame.isShowing) {
         val maximized = (frame as JFrame).extendedState == Frame.MAXIMIZED_BOTH