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 d1d65001330b..dde9ab53a120 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
@@ -56,10 +56,12 @@ class EditBookmarkDescriptionAction extends DumbAwareAction {
 
     BookmarkManager.getInstance(myProject).editDescription(bookmark);
 
-    myPopup.setUiVisible(true);
-    final JComponent content = myPopup.getContent();
-    if (content != null) {
-      myPopup.setSize(content.getPreferredSize());
+    if (myPopup != null && !myPopup.isDisposed()) {
+      myPopup.setUiVisible(true);
+      final JComponent content = myPopup.getContent();
+      if (content != null) {
+        myPopup.setSize(content.getPreferredSize());
+      }
     }
   }