diff --git a/plugins/ByteCodeViewer/src/com/intellij/byteCodeViewer/ShowBytecodeAction.kt b/plugins/ByteCodeViewer/src/com/intellij/byteCodeViewer/ShowBytecodeAction.kt
index b570fb02565e..8ac88e0bbaee 100644
--- a/plugins/ByteCodeViewer/src/com/intellij/byteCodeViewer/ShowBytecodeAction.kt
+++ b/plugins/ByteCodeViewer/src/com/intellij/byteCodeViewer/ShowBytecodeAction.kt
@@ -38,6 +38,7 @@ internal class ShowBytecodeAction : AnAction() {
                     description = clsFile.presentableUrl
                   }
     toolWindow.contentManager.addContent(content)
+    content.setDisposer(panel)
     toolWindow.contentManager.setSelectedContent(content)
     toolWindow.setAdditionalGearActions(createActionGroup())
     toolWindow.activate(null)