diff --git a/interface/web/themes/default_combobox/templates/main.tpl.htm b/interface/web/themes/default_combobox/templates/main.tpl.htm
index c0eb34c4102c21cca1d0eb3c4bf0ac2a0b9e7d49..39800ac20e23ad80c21e568f4c78225af2313d40 100644
--- a/interface/web/themes/default_combobox/templates/main.tpl.htm
+++ b/interface/web/themes/default_combobox/templates/main.tpl.htm
@@ -67,14 +67,15 @@
 			document.getElementsByTagName("head")[0].appendChild(style);
 		}
 
+
 		jQuery(document).ready(function() {
 			loadInitContent();
 		});
 
 		//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();
 			}
 		});
 
@@ -148,6 +149,7 @@
 				this.button = $( "<button type='button'>&nbsp;</button>" )
 					.attr( "tabIndex", -1 )
 					.attr( "title", "Show All Items" )
+					.height($(input).outerHeight())
 					.insertAfter( input )
 					.button({
 						icons: {