diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionListStep.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionListStep.java
index 91b14b0c5c80..148569270d06 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionListStep.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionListStep.java
@@ -370,7 +370,7 @@ public class IntentionListStep implements ListPopupStep<IntentionActionWithTextC
   private int getWeight(IntentionActionWithTextCaching action) {
     IntentionAction a = action.getAction();
     int group = getGroup(action);
-    if (a instanceof IntentionActionDelegate) {
+    while (a instanceof IntentionActionDelegate) {
       a = ((IntentionActionDelegate)a).getDelegate();
     }
     if (a instanceof HighPriorityAction) {
@@ -431,16 +431,16 @@ public class IntentionListStep implements ListPopupStep<IntentionActionWithTextC
       return value.getIcon();
     }
 
-    final IntentionAction action = value.getAction();
+    IntentionAction action = value.getAction();
 
+    while (action instanceof IntentionActionDelegate) {
+      action = ((IntentionActionDelegate)action).getDelegate();
+    }
     Object iconable = action;
     //custom icon
     if (action instanceof QuickFixWrapper) {
       iconable = ((QuickFixWrapper)action).getFix();
     }
-    else if (action instanceof IntentionActionDelegate) {
-      iconable = ((IntentionActionDelegate)action).getDelegate();
-    }
 
     if (iconable instanceof Iconable) {
       final Icon icon = ((Iconable)iconable).getIcon(0);