diff --git a/modules/gui.lua b/modules/gui.lua
index 9e5afc72..a6373d42 100644
--- a/modules/gui.lua
+++ b/modules/gui.lua
@@ -68,10 +68,13 @@ pfUI:RegisterModule("gui", function ()
     frame.category = category
     frame.config = config
     frame.input:SetScript("OnEscapePressed", function(self)
-      this:GetParent().category[this:GetParent().config] = this:GetText()
       this:ClearFocus()
     end)
 
+    frame.input:SetScript("OnEditFocusLost", function(self)
+      this:GetParent().category[this:GetParent().config] = this:GetText()
+    end)
+
     return frame
   end