diff --git a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/SwitchToFind.java b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/SwitchToFind.java
index 673cf470f116..de03b89ac653 100644
--- a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/SwitchToFind.java
+++ b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/SwitchToFind.java
@@ -13,6 +13,8 @@ import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 
+import static com.intellij.openapi.actionSystem.CommonDataKeys.EDITOR;
+
 /**
 * Created by IntelliJ IDEA.
 * User: zajac
@@ -52,7 +54,7 @@ public class SwitchToFind extends AnAction implements DumbAware {
 
     EditorSearchSession search = e.getRequiredData(EditorSearchSession.SESSION_KEY);
     final FindModel findModel = search.getFindModel();
-    FindUtil.configureFindModel(false, null, findModel, false);
+    FindUtil.configureFindModel(false, EDITOR.getData(e.getDataContext()), findModel, false);
     search.getComponent().getSearchTextComponent().selectAll();
   }
 }
diff --git a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/SwitchToReplace.java b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/SwitchToReplace.java
index 7ee08c600c7e..856bdf6e3e7a 100644
--- a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/SwitchToReplace.java
+++ b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/SwitchToReplace.java
@@ -39,7 +39,7 @@ public class SwitchToReplace extends AnAction {
   public void actionPerformed(AnActionEvent e) {
     EditorSearchSession search = e.getRequiredData(EditorSearchSession.SESSION_KEY);
     FindModel findModel = search.getFindModel();
-    FindUtil.configureFindModel(true, null, findModel, false);
+    FindUtil.configureFindModel(true, e.getData(CommonDataKeys.EDITOR_EVEN_IF_INACTIVE), findModel, false);
     search.getComponent().getSearchTextComponent().selectAll();
   }
 }