diff --git a/src/CmpModalInFile.svelte b/src/CmpModalInFile.svelte
index 34c130c..cf642f9 100644
--- a/src/CmpModalInFile.svelte
+++ b/src/CmpModalInFile.svelte
@@ -1,26 +1,36 @@
+<script lang="ts" context="module">
+let lastSearch = ""
+</script>
+
 <script lang="ts">
 import CmpInput from "./CmpInput.svelte"
 import CmpResultInFile from "./CmpResultInFile.svelte"
 import { excerptAfter, type ResultNote, type SearchMatch } from "./globals"
 import { plugin } from "./stores"
 import { loopIndex } from "./utils"
-import { tick } from "svelte"
+import { onMount, tick } from "svelte"
 import { MarkdownView } from "obsidian"
 import { getSuggestions } from "./search"
-import type { OmnisearchModal } from "./modal"
+import type { ModalInFile, ModalVault } from "./modal"
 
-export let modal: OmnisearchModal
-export let parent: OmnisearchModal | null = null
-export let canGoBack = false
+export let modal: ModalInFile
+export let parent: ModalVault | null = null
 export let singleFilePath = ""
-let searchQuery: string
+export let searchQuery: string
 
 let groupedOffsets: number[] = []
 let selectedIndex = 0
 let note: ResultNote | null = null
 
+onMount(() => {
+  searchQuery = lastSearch
+})
+
 $: {
-  note = getSuggestions(searchQuery, { singleFilePath })[0] ?? null
+  if (searchQuery) {
+    note = getSuggestions(searchQuery, { singleFilePath })[0] ?? null
+    lastSearch = searchQuery
+  }
   selectedIndex = 0
   scrollIntoView()
 }
@@ -101,6 +111,7 @@ async function openSelection(): Promise<void> {
 
 <div class="modal-title">Omnisearch - File</div>
 <CmpInput
+  value={searchQuery}
   on:input={(e) => (searchQuery = e.detail)}
   on:enter={openSelection}
   on:arrow-up={() => moveIndex(-1)}
@@ -134,7 +145,7 @@ async function openSelection(): Promise<void> {
   </div>
   <div class="prompt-instruction">
     <span class="prompt-instruction-command">esc</span>
-    {#if canGoBack}
+    {#if !!parent}
       <span>to go back to Vault Search</span>
     {:else}
       <span>to dismiss</span>
diff --git a/src/CmpModalVault.svelte b/src/CmpModalVault.svelte
index f74ac48..94e2038 100644
--- a/src/CmpModalVault.svelte
+++ b/src/CmpModalVault.svelte
@@ -8,13 +8,13 @@ import { onMount, tick } from "svelte"
 import CmpInput from "./CmpInput.svelte"
 import CmpResultNote from "./CmpResultNote.svelte"
 import type { ResultNote } from "./globals"
-import { OmnisearchModal } from "./modal"
+import { ModalInFile, type ModalVault } from "./modal";
 import { openNote } from "./notes"
 import { getSuggestions } from "./search"
 import { plugin } from "./stores"
 import { loopIndex } from "./utils"
 
-export let modal: OmnisearchModal
+export let modal: ModalVault
 let selectedIndex = 0
 let searchQuery: string
 let resultNotes: ResultNote[] = []
@@ -29,8 +29,7 @@ $: {
   scrollIntoView()
 }
 
-onMount(async () => {
-  await tick()
+onMount(() => {
   searchQuery = lastSearch
 })
 
@@ -81,7 +80,7 @@ function onInputAltEnter(): void {
     const file = $plugin.app.vault.getAbstractFileByPath(selectedNote.path)
     if (file && file instanceof TFile) {
       // modal.close()
-      new OmnisearchModal($plugin, file, true, modal).open()
+      new ModalInFile($plugin, file, searchQuery, modal).open()
     }
   }
 }
diff --git a/src/main.ts b/src/main.ts
index 8952023..8e48598 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,5 +1,4 @@
 import { MarkdownView, Plugin, TFile } from 'obsidian'
-import { OmnisearchModal } from './modal'
 import { plugin } from './stores'
 import {
   addToIndex,
@@ -7,6 +6,7 @@ import {
   removeFromIndex,
   removeFromIndexByPath,
 } from './search'
+import { ModalInFile, ModalVault } from './modal'
 
 export default class OmnisearchPlugin extends Plugin {
   async onload(): Promise<void> {
@@ -17,7 +17,7 @@ export default class OmnisearchPlugin extends Plugin {
       id: 'show-modal',
       name: 'Vault search',
       callback: () => {
-        new OmnisearchModal(this).open()
+        new ModalVault(this).open()
       },
     })
 
@@ -28,7 +28,7 @@ export default class OmnisearchPlugin extends Plugin {
         const view = this.app.workspace.getActiveViewOfType(MarkdownView)
         if (view) {
           if (!checking) {
-            new OmnisearchModal(this, view.file).open()
+            new ModalInFile(this, view.file).open()
           }
           return true
         }
diff --git a/src/modal.ts b/src/modal.ts
index c05b73c..cd892fe 100644
--- a/src/modal.ts
+++ b/src/modal.ts
@@ -3,13 +3,8 @@ import type OmnisearchPlugin from './main'
 import CmpModalVault from './CmpModalVault.svelte'
 import CmpModalInFile from './CmpModalInFile.svelte'
 
-export class OmnisearchModal extends Modal {
-  constructor(
-    plugin: OmnisearchPlugin,
-    file?: TFile,
-    canGoBack = false,
-    parent?: OmnisearchModal,
-  ) {
+abstract class ModalOmnisearch extends Modal {
+  constructor(plugin: OmnisearchPlugin) {
     super(plugin.app)
 
     // Remove all the default modal's children (except the close button)
@@ -18,25 +13,47 @@ export class OmnisearchModal extends Modal {
     this.modalEl.replaceChildren()
     this.modalEl.append(closeEl)
     this.modalEl.addClass('omnisearch-modal', 'prompt')
-
-    if (file) {
-      new CmpModalInFile({
-        target: this.modalEl,
-        props: {
-          modal: this,
-          canGoBack,
-          singleFilePath: file.path,
-          parent: parent,
-        },
-      })
-    }
-    else {
-      new CmpModalVault({
-        target: this.modalEl,
-        props: {
-          modal: this,
-        },
-      })
-    }
+  }
+}
+
+export class ModalVault extends ModalOmnisearch {
+  constructor(plugin: OmnisearchPlugin) {
+    super(plugin)
+
+    new CmpModalVault({
+      target: this.modalEl,
+      props: {
+        modal: this,
+      },
+    })
+  }
+}
+
+export class ModalInFile extends ModalOmnisearch {
+  constructor(
+    plugin: OmnisearchPlugin,
+    file: TFile,
+    searchQuery: string = '',
+    parent?: ModalOmnisearch,
+  ) {
+    super(plugin)
+
+    if (parent) {
+      // Hide the parent modal
+      parent.containerEl.toggleVisibility(false)
+      this.onClose = () => {
+        parent.containerEl.toggleVisibility(true)
+      }
+    }
+
+    new CmpModalInFile({
+      target: this.modalEl,
+      props: {
+        modal: this,
+        singleFilePath: file.path,
+        parent: parent,
+        searchQuery,
+      },
+    })
   }
 }