diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index 83cf44bce89c17f8924178b11ad7e08ce8e69440..9a7c138fe2848da0226dfde9df552951eee2fe5e 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -77,9 +77,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();
 			}
 		});
 
diff --git a/interface/web/themes/default_64_navimg/templates/main.tpl.htm b/interface/web/themes/default_64_navimg/templates/main.tpl.htm
index a0a08f05e43dc49254dc3dd75614dab7a851b846..db3133f30f1ff10829ab9e5dfc59ffc71443b0f4 100644
--- a/interface/web/themes/default_64_navimg/templates/main.tpl.htm
+++ b/interface/web/themes/default_64_navimg/templates/main.tpl.htm
@@ -77,9 +77,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();
 			}
 		});
 	</script>
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();
 			}
 		});
 
diff --git a/interface/web/themes/default_no_navimg/templates/main.tpl.htm b/interface/web/themes/default_no_navimg/templates/main.tpl.htm
index 7d2571de45f34e8ff1f5eed46c9aa532fecccd45..6c7a67ca156b5002ee2b5a8b9c1e6a49532f45ff 100644
--- a/interface/web/themes/default_no_navimg/templates/main.tpl.htm
+++ b/interface/web/themes/default_no_navimg/templates/main.tpl.htm
@@ -77,9 +77,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();
 			}
 		});