diff --git a/search_frame.lua b/search_frame.lua
index 59466e0..f87b7de 100644
--- a/search_frame.lua
+++ b/search_frame.lua
@@ -25,6 +25,7 @@ do
             local rename_info = private.popup_info.rename
             local edit_box = getglobal(this:GetName()..'EditBox')
             edit_box:SetText(rename_info.name or '')
+            edit_box:SetFocus()
             edit_box:HighlightText()
         end,
         OnAccept = action,