diff --git a/mods/unified_inventory/callbacks.lua b/mods/unified_inventory/callbacks.lua
index fbe4d91f..08a9f101 100755
--- a/mods/unified_inventory/callbacks.lua
+++ b/mods/unified_inventory/callbacks.lua
@@ -164,7 +164,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 		end
 	end
 
-	if fields.searchbutton then
+	if fields.searchbutton or fields.key_enter_field == "searchbox" then
 		unified_inventory.apply_filter(player, unified_inventory.current_searchbox[player_name], "nochange")
 		unified_inventory.set_inventory_formspec(player,
 				unified_inventory.current_page[player_name])
diff --git a/mods/unified_inventory/internal.lua b/mods/unified_inventory/internal.lua
index 80d7ef01..044e7d42 100755
--- a/mods/unified_inventory/internal.lua
+++ b/mods/unified_inventory/internal.lua
@@ -189,6 +189,8 @@ function unified_inventory.get_formspec(player, page)
 	n = n+1
 
 	-- Search box
+	formspec[n] = "field_close_on_enter[searchbox;false]"
+	n = n+1
 
 	if not draw_lite_mode then
 		formspec[n] = "field[9.5,8.325;3,1;searchbox;;"