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 6860839c8510..086ad5fc70c6 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
@@ -66,7 +66,10 @@ class EditBookmarkDescriptionAction extends DumbAwareAction {
     BookmarkManager.getInstance(myProject).setDescription(b, description);
 
     myPopup.setUiVisible(true);
-    myPopup.setSize(myPopup.getContent().getPreferredSize());
+    final JComponent content = myPopup.getContent();
+    if (content != null) {
+      myPopup.setSize(content.getPreferredSize());
+    }
   }
 
   public void setPopup(JBPopup popup) {