diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchDialog.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchDialog.java
index 552157b8bedd..776a4037c36c 100644
--- a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchDialog.java
+++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchDialog.java
@@ -185,6 +185,7 @@ public class StructuralSearchDialog extends DialogWrapper {
       @Override
       public void projectClosing(@NotNull Project project) {
         close(CANCEL_EXIT_CODE);
+        ProjectManager.getInstance().removeProjectManagerListener(searchContext.getProject(), this);
       }
     });
   }