diff --git a/images/src/org/intellij/images/thumbnail/actions/FilterByTagComboBoxAction.java b/images/src/org/intellij/images/thumbnail/actions/FilterByTagComboBoxAction.java
index 88788ef136ec..925a6f44fcae 100644
--- a/images/src/org/intellij/images/thumbnail/actions/FilterByTagComboBoxAction.java
+++ b/images/src/org/intellij/images/thumbnail/actions/FilterByTagComboBoxAction.java
@@ -35,6 +35,10 @@ public final class FilterByTagComboBoxAction extends ComboBoxAction {
     
     public void update(final AnActionEvent e) {
         Project project = e.getProject();
+        if (project == null) {
+            e.getPresentation().setEnabledAndVisible(false);
+            return;
+        }
         ThumbnailView view = ThumbnailViewActionUtil.getVisibleThumbnailView(e);
         ImageTagManager tagManager = ImageTagManager.getInstance(project);
         e.getPresentation().setVisible(view != null && !tagManager.getAllTags().isEmpty());