diff --git a/platform/editor-ui-api/src/com/intellij/openapi/actionSystem/AnAction.java b/platform/editor-ui-api/src/com/intellij/openapi/actionSystem/AnAction.java
index 4d1a1ca35bcf..da4cb7daee7d 100644
--- a/platform/editor-ui-api/src/com/intellij/openapi/actionSystem/AnAction.java
+++ b/platform/editor-ui-api/src/com/intellij/openapi/actionSystem/AnAction.java
@@ -164,15 +164,15 @@ public abstract class AnAction implements PossiblyDumbAware {
       if (!actionList.contains(this)){
         actionList.add(this);
       }
-    }
 
-    if (parentDisposable != null) {
-      Disposer.register(parentDisposable, new Disposable() {
-        @Override
-        public void dispose() {
-          unregisterCustomShortcutSet(component);
-        }
-      });
+      if (parentDisposable != null) {
+        Disposer.register(parentDisposable, new Disposable() {
+          @Override
+          public void dispose() {
+            unregisterCustomShortcutSet(component);
+          }
+        });
+      }
     }
   }