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 cfb6d0bcea5b..84ecf5006e9b 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
@@ -204,7 +204,8 @@ class IntentionListStep implements ListPopupStep<IntentionActionWithTextCaching>
       return FINAL_CHOICE;
     }
 
-    if (hasSubstep(action)) {
+    //disable sub menu selection on enter (when no quick fix available)
+    if (!finalChoice && hasSubstep(action)) {
       return getSubStep(action, action.getToolName());
     }