diff --git a/callbacks.lua b/callbacks.lua
index 7240814..e6ea3e7 100644
--- a/callbacks.lua
+++ b/callbacks.lua
@@ -154,7 +154,8 @@ 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/internal.lua b/internal.lua
index f143355..5732971 100644
--- a/internal.lua
+++ b/internal.lua
@@ -182,6 +182,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;;"