diff --git a/externals/ui-textinput.lua b/externals/ui-textinput.lua
index c4970b2..c6a78de 100644
--- a/externals/ui-textinput.lua
+++ b/externals/ui-textinput.lua
@@ -6,7 +6,6 @@ local BORDER_TEXTURE = "Interface\\Common\\Common-Input-Border"
 
 
 local function OnShow(self)
-  self:SetText("")
   self.placeholder:Show()
 end
 
diff --git a/frames/SearchField.lua b/frames/SearchField.lua
index 872cf2f..a435f54 100644
--- a/frames/SearchField.lua
+++ b/frames/SearchField.lua
@@ -24,6 +24,7 @@ function ns.MakeSearchField(parent)
   end)
 
   editbox:SetScript("OnLeave", GameTooltip_Hide)
+  editbox:SetScript("OnShow", function(self) self:SetText("") end)
 
   ns.MakeSearchField = nil