diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/DeleteBookmarkAction.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/DeleteBookmarkAction.java
index 385495b320a0..fca781b00191 100644
--- a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/DeleteBookmarkAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/DeleteBookmarkAction.java
@@ -33,6 +33,7 @@ class DeleteBookmarkAction extends DumbAwareAction {
 
   DeleteBookmarkAction(Project project, JList list) {
     super("Delete", "Delete current bookmark", AllIcons.General.Remove);
+    setEnabledInModalContext(true);
     myProject = project;
     myList = list;
     registerCustomShortcutSet(CustomShortcutSet.fromString("DELETE", "BACK_SPACE"), list);
diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/EditBookmarkDescriptionAction.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/EditBookmarkDescriptionAction.java
index dde9ab53a120..1db13f13142d 100644
--- a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/EditBookmarkDescriptionAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/EditBookmarkDescriptionAction.java
@@ -36,6 +36,7 @@ class EditBookmarkDescriptionAction extends DumbAwareAction {
   EditBookmarkDescriptionAction(Project project, JList list) {
     super(IdeBundle.message("action.bookmark.edit.description"),
           IdeBundle.message("action.bookmark.edit.description.description"), AllIcons.Actions.Edit);
+    setEnabledInModalContext(true);
     myProject = project;
     myList = list;
     registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(SystemInfo.isMac ? "meta ENTER" : "control ENTER")), list);
diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/MoveBookmarkDownAction.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/MoveBookmarkDownAction.java
index eef19c86fce2..5465dfbab9c9 100644
--- a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/MoveBookmarkDownAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/MoveBookmarkDownAction.java
@@ -33,6 +33,7 @@ class MoveBookmarkDownAction extends DumbAwareAction {
 
   MoveBookmarkDownAction(Project project, JList list) {
     super("Down", "Move current bookmark down", AllIcons.Actions.NextOccurence);
+    setEnabledInModalContext(true);
     myProject = project;
     myList = list;
     registerCustomShortcutSet(CommonShortcuts.MOVE_DOWN, list);
diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/MoveBookmarkUpAction.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/MoveBookmarkUpAction.java
index 7883352bf24d..90cb66252411 100644
--- a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/MoveBookmarkUpAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/MoveBookmarkUpAction.java
@@ -32,6 +32,7 @@ class MoveBookmarkUpAction extends DumbAwareAction {
 
   MoveBookmarkUpAction(Project project, JList list) {
     super("Up", "Move current bookmark up", AllIcons.Actions.PreviousOccurence);
+    setEnabledInModalContext(true);
     myProject = project;
     myList = list;
     registerCustomShortcutSet(CommonShortcuts.MOVE_UP, list);
diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleNumberedBookmarkActionBase.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleNumberedBookmarkActionBase.java
index 58ad34e6505d..2e65da020471 100644
--- a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleNumberedBookmarkActionBase.java
+++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleNumberedBookmarkActionBase.java
@@ -30,6 +30,7 @@ public abstract class ToggleNumberedBookmarkActionBase extends AnAction implemen
   private final int myNumber;
 
   public ToggleNumberedBookmarkActionBase(int n) {
+    setEnabledInModalContext(true);
     myNumber = n;
   }
 
diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleSortBookmarksAction.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleSortBookmarksAction.java
index 876c38b1f994..cc9f1d9401a9 100644
--- a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleSortBookmarksAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleSortBookmarksAction.java
@@ -24,6 +24,7 @@ import com.intellij.openapi.actionSystem.ToggleAction;
 public class ToggleSortBookmarksAction extends ToggleAction {
   public ToggleSortBookmarksAction() {
     super(null, IdeBundle.message("action.bookmark.toggle.sort"), AllIcons.ObjectBrowser.Sorted);
+    setEnabledInModalContext(true);
   }
 
   @Override