diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/BookmarksAction.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/BookmarksAction.java
index c3588e65d797..dbd7dff584cf 100644
--- a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/BookmarksAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/BookmarksAction.java
@@ -67,7 +67,10 @@ public class BookmarksAction extends AnAction implements DumbAware, MasterDetail
     final Project project = e.getProject();
     if (project == null) return;
 
-    if (myPopup != null && myPopup.isVisible()) return;
+    if (myPopup != null && myPopup.isVisible()) {
+      myPopup.cancel();
+      return;
+    }
 
     final JBList list = new JBList(buildModel(project));