diff --git a/tabs/search/frame.lua b/tabs/search/frame.lua
index 41d84c1..78bcff9 100644
--- a/tabs/search/frame.lua
+++ b/tabs/search/frame.lua
@@ -161,6 +161,7 @@ do
 		return queries and join(map(copy(queries), function(query) return query.prettified end), ';') or color.red(str)
 	end
 	editbox.complete = completion.complete_filter
+    editbox.focus_loss = function() this:SetText(current_search.filter_string or '') end
 	editbox:SetHeight(25)
 	editbox.char = function()
 		this:complete()
diff --git a/tabs/search/results.lua b/tabs/search/results.lua
index 42929e5..e94dba2 100644
--- a/tabs/search/results.lua
+++ b/tabs/search/results.lua
@@ -321,8 +321,6 @@ function M.execute(resume, real_time)
 		end
 	end
 
-	clear_control_focus()
-
 	if resume then
 		current_search.table:SetSelectedRecord()
 	else
@@ -348,7 +346,7 @@ function M.execute(resume, real_time)
 	discard_continuation()
 	current_search.active = true
 	update_start_stop()
-
+	clear_control_focus()
 	subtab = RESULTS
 	if real_time then
 		start_real_time_scan(queries[1], nil, continuation)