diff --git a/Postal.lua b/Postal.lua
index 9184502..99375b6 100644
--- a/Postal.lua
+++ b/Postal.lua
@@ -166,6 +166,13 @@ function self:ADDON_LOADED()
 			PostalSubjectEditBox:SetFocus()
 		end
     end)
+    SendMailNameEditBox:SetScript('OnEnterPressed', function()
+    	if AutoCompleteBox:IsVisible() then
+    		AutoCompleteBox:Hide()
+		else
+			PostalSubjectEditBox:SetFocus()
+		end
+    end)
     SendMailNameEditBox:SetScript('OnEscapePressed', function()
     	if AutoCompleteBox:IsVisible() then
     		AutoCompleteBox:Hide()