diff --git a/interface/web/themes/default_combobox/templates/main.tpl.htm b/interface/web/themes/default_combobox/templates/main.tpl.htm
index 6c1b46d07f987e2d50f79035abad6736a6b869e8..df26afd64e65295d2223a2e5210b45b8970ccd40 100644
--- a/interface/web/themes/default_combobox/templates/main.tpl.htm
+++ b/interface/web/themes/default_combobox/templates/main.tpl.htm
@@ -79,9 +79,9 @@
 		});
 		
 		//Use jQuery submit with kespress Enter in panel filterbar
-		jQuery(document).bind("keypress", function(event) {
-			if (event.which == '13' && $(".panel #Filter").length > 0) {
-				$(".panel #Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit();
+		jQuery(".panel .list input").live("keypress", function(event) {
+			if (event.which == '13' && $(this).parents("tr").find("#Filter")) {
+				$(this).parents("tr").find("#Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit();
 			}
 		});