diff --git a/tabs/search/filter.lua b/tabs/search/filter.lua
index 4aaaf65..8a603e1 100644
--- a/tabs/search/filter.lua
+++ b/tabs/search/filter.lua
@@ -191,8 +191,8 @@ function import_filter_string()
 end
 
 function export_filter_string()
+	search_box:SetFocus()
 	search_box:SetText(get_filter_builder_query())
-	filter_parameter_input:ClearFocus()
 end
 
 function formatted_post_filter(components)
diff --git a/tabs/search/saved.lua b/tabs/search/saved.lua
index b773c9e..753cbf0 100644
--- a/tabs/search/saved.lua
+++ b/tabs/search/saved.lua
@@ -47,8 +47,10 @@ handlers = {
 	OnClick = function(st, data, _, button)
 		if not data then return end
 		if button == 'LeftButton' and IsShiftKeyDown() then
+			search_box:SetFocus()
 			search_box:SetText(data.search.filter_string)
 		elseif button == 'RightButton' and IsShiftKeyDown() then
+			search_box:SetFocus()
 			add_filter(data.search.filter_string)
 		elseif button == 'LeftButton' then
 			search_box:SetText(data.search.filter_string)