diff --git a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/EditorHeaderToggleAction.java b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/EditorHeaderToggleAction.java
index a4f246cc2be2..236c79f6d011 100644
--- a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/EditorHeaderToggleAction.java
+++ b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/EditorHeaderToggleAction.java
@@ -4,10 +4,11 @@ import com.intellij.find.EditorSearchComponent;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.Presentation;
 import com.intellij.openapi.actionSystem.ex.CheckboxAction;
+import com.intellij.openapi.project.DumbAware;
 
 import javax.swing.*;
 
-public abstract class EditorHeaderToggleAction extends CheckboxAction {
+public abstract class EditorHeaderToggleAction extends CheckboxAction implements DumbAware {
 
   @Override
   public boolean displayTextInToolbar() {
diff --git a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/VariantsCompletionAction.java b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/VariantsCompletionAction.java
index 1a338939f387..16284aa27431 100644
--- a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/VariantsCompletionAction.java
+++ b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/VariantsCompletionAction.java
@@ -26,11 +26,16 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-public class VariantsCompletionAction extends EditorHeaderAction {
+public class VariantsCompletionAction extends AnAction {
   private Getter<JTextComponent> myTextField;
+  private EditorSearchComponent myEditorSearchComponent;
+
+  public EditorSearchComponent getEditorSearchComponent() {
+    return myEditorSearchComponent;
+  }
 
   public VariantsCompletionAction(EditorSearchComponent editorSearchComponent, Getter<JTextComponent> textField) {
-    super(editorSearchComponent);
+    myEditorSearchComponent = editorSearchComponent;
     final AnAction action = ActionManager.getInstance().getAction(IdeActions.ACTION_CODE_COMPLETION);
     setTextField(textField);
     if (action != null) {