diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/FocusManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/FocusManagerImpl.java
index a6ee0d075f25..afd95bde1dd3 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/FocusManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/FocusManagerImpl.java
@@ -434,6 +434,10 @@ public class FocusManagerImpl extends IdeFocusManager implements Disposable {
   public void dispose() {
     myForcedFocusRequestsAlarm.cancelAllRequests();
     myFocusedComponentAlarm.cancelAllRequests();
+    for (FurtherRequestor requestor : myValidFurtherRequestors) {
+      Disposer.dispose(requestor);
+    }
+    myValidFurtherRequestors.clear();
   }
 
   private class KeyProcessorContext implements KeyEventProcessor.Context {