diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java b/platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java
index fdc42fc91cd3..150fff81fd55 100644
--- a/platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java
+++ b/platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java
@@ -140,6 +140,11 @@ public class BranchActionGroupPopup extends FlatSpeedSearchPopup {
           processOnSizeChanged();
         }
       }
+
+      @Override
+      public void componentHidden(ComponentEvent e) {
+        popupWindow.removeComponentListener(this);
+      }
     });
     if (dimensionKey != null) {
       addPopupListener(new JBPopupAdapter() {