diff --git a/lam/lib/lists.inc b/lam/lib/lists.inc
index 98a84a98..04df49af 100644
--- a/lam/lib/lists.inc
+++ b/lam/lib/lists.inc
@@ -398,7 +398,7 @@ class lamList {
 				$value = " value=\"" . $_POST["filter" . strtolower($this->attrArray[$k])] . "\"";
 			}
 			echo "<td>";
-			echo ("<input type=\"text\" size=15 name=\"filter" . strtolower ($this->attrArray[$k]) ."\"" . $value . ">");
+			echo ("<input type=\"text\" size=15 name=\"filter" . strtolower ($this->attrArray[$k]) ."\"" . $value . " onkeypress=\"SubmitForm('apply_filter', event)\">");
 			echo "</td>\n";
 		}
 		echo "</tr>\n";
diff --git a/lam/templates/lists/list.js b/lam/templates/lists/list.js
index 22069a2e..3d95cc0a 100644
--- a/lam/templates/lists/list.js
+++ b/lam/templates/lists/list.js
@@ -56,3 +56,10 @@ function listOUchanged(type) {
 	selectOU = document.getElementsByName('suffix')[0];
 	location.href='list.php?type=' + type + '&suffix=' + selectOU.options[selectOU.selectedIndex].value;
 }
+
+function SubmitForm(id, e) {
+	if (e.keyCode == 13) {
+		document.getElementsByName(id)[0].click();
+		return false;
+	}
+}