diff --git a/src/components/InputSearch.svelte b/src/components/InputSearch.svelte
index 9cabb6c..8478a67 100644
--- a/src/components/InputSearch.svelte
+++ b/src/components/InputSearch.svelte
@@ -18,6 +18,7 @@
   }
 
   async function selectInput() {
+    await tick()
     elInput.focus()
     await tick()
     elInput.select()
diff --git a/src/components/ModalInFile.svelte b/src/components/ModalInFile.svelte
index 148d875..09ad24e 100644
--- a/src/components/ModalInFile.svelte
+++ b/src/components/ModalInFile.svelte
@@ -62,8 +62,6 @@
       groupedOffsets = groups.map(group =>
         Math.round((group.first()!.offset + group.last()!.offset) / 2)
       )
-      // console.log(groups)
-      // console.log(groupedOffsets)
     }
   }
 
@@ -145,7 +143,7 @@
 <InputSearch
   on:input="{e => (searchQuery = e.detail)}"
   placeholder="Omnisearch - File"
-  value="{searchQuery}"/>
+  initialValue="{searchQuery}"/>
 
 <ModalContainer>
   {#if groupedOffsets.length && note}
diff --git a/src/components/ModalVault.svelte b/src/components/ModalVault.svelte
index 67e4043..8199372 100644
--- a/src/components/ModalVault.svelte
+++ b/src/components/ModalVault.svelte
@@ -12,7 +12,7 @@
   import { Query } from 'src/search/query'
   import { settings } from '../settings'
   import * as NotesIndex from '../notes-index'
-  import { cacheManager } from "../cache-manager"
+  import { cacheManager } from '../cache-manager'
 
   export let modal: OmnisearchVaultModal
   let selectedIndex = 0
@@ -31,8 +31,6 @@
   }
 
   onMount(async () => {
-    await NotesIndex.refreshIndex()
-    previousQuery = (await cacheManager.getSearchHistory())[historySearchIndex]
     eventBus.enable('vault')
     eventBus.on('vault', 'enter', openNoteAndCloseModal)
     eventBus.on('vault', 'create-note', createNoteAndCloseModal)
@@ -43,6 +41,8 @@
     eventBus.on('vault', 'arrow-down', () => moveIndex(1))
     eventBus.on('vault', 'prev-search-history', prevSearchHistory)
     eventBus.on('vault', 'next-search-history', nextSearchHistory)
+    await NotesIndex.refreshIndex()
+    previousQuery = (await cacheManager.getSearchHistory())[0]
   })
 
   onDestroy(() => {