diff --git a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DockablePopupManager.java b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DockablePopupManager.java
index bd254bbfb9af..1c81a500bf6e 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DockablePopupManager.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DockablePopupManager.java
@@ -70,8 +70,21 @@ public abstract class DockablePopupManager<T extends JComponent & Disposable> {
   protected abstract String getTitle(PsiElement element);
   protected abstract String getToolwindowId();
   
-  
-  
+  public Content recreateToolWindow(PsiElement element, PsiElement originalElement) {
+    if (myToolWindow == null) {
+      createToolWindow(element, originalElement);
+      return null;
+    }
+
+    final Content content = myToolWindow.getContentManager().getSelectedContent();
+    if (content == null || !myToolWindow.isVisible()) {
+      restorePopupBehavior();
+      createToolWindow(element, originalElement);
+      return null;
+    }
+    return content;
+  }
+
   public void createToolWindow(final PsiElement element, PsiElement originalElement) {
     assert myToolWindow == null;
 
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationManager.java b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationManager.java
index 9f55baad59b1..0b6578c54635 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationManager.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationManager.java
@@ -190,21 +190,12 @@ public class DocumentationManager extends DockablePopupManager<DocumentationComp
   }
 
   public void showJavaDocInfoAtToolWindow(@NotNull PsiElement element, @NotNull PsiElement original) {
-    if (myToolWindow == null) {
-      createToolWindow(element, original);
-      return;
-    }
-
-    final Content content = myToolWindow.getContentManager().getSelectedContent();
-    if (content == null || !myToolWindow.isVisible()) {
-      restorePopupBehavior();
-      createToolWindow(element, original);
-      return;
-    }
+    final Content content = recreateToolWindow(element, original);
+    if (content == null) return;
 
     fetchDocInfo(getDefaultCollector(element, original), (DocumentationComponent)content.getComponent(), true);
   }
-  
+
   public void showJavaDocInfo(@NotNull final PsiElement element, final PsiElement original) {
     showJavaDocInfo(element, original, false, null);
   }
diff --git a/plugins/ByteCodeViewer/src/com/intellij/byteCodeViewer/ShowByteCodeAction.java b/plugins/ByteCodeViewer/src/com/intellij/byteCodeViewer/ShowByteCodeAction.java
index 1905bd08a41b..34b5d446e3ba 100644
--- a/plugins/ByteCodeViewer/src/com/intellij/byteCodeViewer/ShowByteCodeAction.java
+++ b/plugins/ByteCodeViewer/src/com/intellij/byteCodeViewer/ShowByteCodeAction.java
@@ -113,7 +113,7 @@ public class ShowByteCodeAction extends AnAction {
           Processor<JBPopup> pinCallback = new Processor<JBPopup>() {
             @Override
             public boolean process(JBPopup popup) {
-              codeViewerManager.createToolWindow(targetElement, targetElement);
+              codeViewerManager.recreateToolWindow(targetElement, targetElement);
               popup.cancel();
               return false;
             }