diff --git a/platform/lang-impl/src/com/intellij/execution/console/ConsoleExecuteAction.java b/platform/lang-impl/src/com/intellij/execution/console/ConsoleExecuteAction.java
index 2f4c9e7ac993..eebc75fec4a7 100644
--- a/platform/lang-impl/src/com/intellij/execution/console/ConsoleExecuteAction.java
+++ b/platform/lang-impl/src/com/intellij/execution/console/ConsoleExecuteAction.java
@@ -28,6 +28,7 @@ import com.intellij.openapi.editor.ex.EditorEx;
 import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.Conditions;
+import com.intellij.openapi.util.text.StringUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -94,9 +95,13 @@ public class ConsoleExecuteAction extends DumbAwareAction {
   @Override
   public final void update(AnActionEvent e) {
     EditorEx editor = myConsole.getConsoleEditor();
-    Lookup lookup = LookupManager.getActiveLookup(editor);
-    e.getPresentation().setEnabled(!editor.isRendererMode() && isEnabled() &&
-                                   (lookup == null || !lookup.isCompletion()));
+    boolean enabled = !editor.isRendererMode() && isEnabled() && !StringUtil.isEmptyOrSpaces(editor.getDocument().getCharsSequence());
+    if (enabled) {
+      Lookup lookup = LookupManager.getActiveLookup(editor);
+      enabled = lookup == null || !lookup.isCompletion();
+    }
+
+    e.getPresentation().setEnabled(enabled);
   }
 
   @Override