diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/ShowHideIntentionIconLookupAction.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/ShowHideIntentionIconLookupAction.java
index eed399aee527..111571f8a9d9 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/ShowHideIntentionIconLookupAction.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/ShowHideIntentionIconLookupAction.java
@@ -26,7 +26,7 @@ public class ShowHideIntentionIconLookupAction extends LookupElementAction {
   private static final String KEY = "completion.show.intention.icon";
 
   public ShowHideIntentionIconLookupAction() {
-    super(AllIcons.Actions.IntentionBulb, (Registry.is(KEY) ? "Never" : "Always") + " show intention icon");
+    super(AllIcons.Actions.IntentionBulb, (Registry.is(KEY) ? "Never show" : "Show") + " intention icon");
   }
 
   @Override
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
index bbef0f6ee782..4b28756d4474 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
@@ -363,7 +363,9 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
     for (LookupActionProvider provider : LookupActionProvider.EP_NAME.getExtensions()) {
       provider.fillActions(element, this, consumer);
     }
-    consumer.consume(new ShowHideIntentionIconLookupAction());
+    if (!consumer.getResult().isEmpty()) {
+      consumer.consume(new ShowHideIntentionIconLookupAction());
+    }
     return consumer.getResult();
   }