From 237ba73f28dd8bc06069e8b2e247e2e8b625243f Mon Sep 17 00:00:00 2001
From: Dennis Ushakov <dennis.ushakov@gmail.com>
Date: Fri, 28 Nov 2014 15:05:50 +0300
Subject: [PATCH] #WEB-7236 fixed

---
 .../com/intellij/openapi/editor/impl/ContextMenuImpl.java | 8 ++------
 .../browsers/actions/OpenInBrowserBaseGroupAction.java    | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/ContextMenuImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/ContextMenuImpl.java
index cbe6da5379cf..c6d567927861 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/ContextMenuImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/ContextMenuImpl.java
@@ -116,17 +116,13 @@ public class ContextMenuImpl extends JPanel implements Disposable {
   }
 
   private void toggleContextToolbar(final boolean show) {
-    final Component toolbar = myComponent.getComponent(0);
-    final int count = ((Container)toolbar).getComponentCount();
-    if (count == 0) {
+    myActionToolbar.updateActionsImmediately();
+    if (((Container)myActionToolbar).getComponentCount() == 0) {
       return;
     }
 
     if (myShow != show) {
       myShow = show;
-      if (myShow && myActionToolbar != null) {
-        myActionToolbar.updateActionsImmediately();
-      }
       restartTimer();
     }
   }
diff --git a/xml/impl/src/com/intellij/ide/browsers/actions/OpenInBrowserBaseGroupAction.java b/xml/impl/src/com/intellij/ide/browsers/actions/OpenInBrowserBaseGroupAction.java
index 482828c24c5e..5298e0e7b90e 100644
--- a/xml/impl/src/com/intellij/ide/browsers/actions/OpenInBrowserBaseGroupAction.java
+++ b/xml/impl/src/com/intellij/ide/browsers/actions/OpenInBrowserBaseGroupAction.java
@@ -80,7 +80,7 @@ public abstract class OpenInBrowserBaseGroupAction extends ComputableActionGroup
 
     @Override
     public void update(@NotNull AnActionEvent e) {
-      e.getPresentation().setVisible(!WebBrowserManager.getInstance().getBrowsers().isEmpty());
+      e.getPresentation().setVisible(!WebBrowserManager.getInstance().getActiveBrowsers().isEmpty());
     }
   }
 }
\ No newline at end of file