diff --git a/editor/src/main/java/com/itsaky/androidide/editor/ui/EditorSearchLayout.kt b/editor/src/main/java/com/itsaky/androidide/editor/ui/EditorSearchLayout.kt
index 24d754fbd9..1c39f28eb7 100644
--- a/editor/src/main/java/com/itsaky/androidide/editor/ui/EditorSearchLayout.kt
+++ b/editor/src/main/java/com/itsaky/androidide/editor/ui/EditorSearchLayout.kt
@@ -242,6 +242,8 @@ class EditorSearchLayout(
 		findInFileBinding.root.visibility = VISIBLE
 		onSearchModeChanged?.invoke(true)
 
+		refreshSearch()
+
 		findInFileBinding.searchInput.requestFocus()
 		findInFileBinding.searchInput.post {
 			ViewCompat.getWindowInsetsController(findInFileBinding.searchInput)?.show(WindowInsetsCompat.Type.ime())
@@ -292,6 +294,9 @@ class EditorSearchLayout(
 			searcher.onClose()
 			onSearchModeChanged?.invoke(false)
 		}
+		if (!searcher.hasQuery()) {
+			refreshSearch()
+		}
 		if (!searcher.hasQuery()) {
 			return
 		}