diff --git a/core.lua b/core.lua
index 09e1bc3..4dcef07 100644
--- a/core.lua
+++ b/core.lua
@@ -1,5 +1,5 @@
 Aux = {
-    version = '2.15.3',
+    version = '2.15.4',
     blizzard_ui_shown = false,
 	orig = {},
 }
diff --git a/panels/search/core.lua b/panels/search/core.lua
index 832f58e..1f074cf 100644
--- a/panels/search/core.lua
+++ b/panels/search/core.lua
@@ -212,9 +212,16 @@ function public.execute(mode, filter_string)
         private.search_box:SetText(filter_string)
     end
 
+    if mode == 'search' and private.search_box:GetText() == private.current_search().filter_string then
+        mode = 'refresh'
+    end
+
     local queries, filters
-    if mode == 'refresh' then
+    if mode == 'refresh' or mode == 'resume' then
+        private.search_box:ClearFocus()
         private.search_box:SetText(private.current_search().filter_string)
+    end
+    if mode == 'refresh' then
         private.current_search().records = {}
         private.results_listing:SetDatabase(private.current_search().records)
     end
@@ -431,6 +438,7 @@ do
 
     function private.update_search()
         Aux.scan.abort(search_scan_id)
+        private.search_box:ClearFocus()
         private.search_box:SetText(searches[search_index].filter_string)
         private.results_listing:Reset()
         private.results_listing:SetDatabase(searches[search_index].records)
diff --git a/panels/search/frames.lua b/panels/search/frames.lua
index a27242a..6a148e6 100644
--- a/panels/search/frames.lua
+++ b/panels/search/frames.lua
@@ -24,7 +24,6 @@ function Aux.search_frame.create_frames(private, public)
         btn:SetHeight(25)
         btn:SetText(GREEN_FONT_COLOR_CODE..'Resume'..FONT_COLOR_CODE_CLOSE)
         btn:SetScript('OnClick', function()
-            private.search_box:ClearFocus()
             public.execute('resume')
         end)
         private.resume_button = btn