diff --git a/lam/lib/lists.inc b/lam/lib/lists.inc
index 85862665..c7a8dc01 100644
--- a/lam/lib/lists.inc
+++ b/lam/lib/lists.inc
@@ -341,7 +341,7 @@ class lamList {
 			printHelpLink(getHelp('', '250'), '250');
 		echo "</td>\n";
 		echo "<td>";
-		echo "<button class=\"smallPadding\" id=\"filterButton\" name=\"apply_filter\">" . _("Filter") . "</button>";
+		echo "<button type=\"submit\" class=\"smallPadding\" id=\"apply_filter\" name=\"apply_filter\">" . _("Filter") . "</button>";
 		echo "</td>\n";
 		// print input boxes for filters
 		for ($k = 0; $k < sizeof ($this->descArray); $k++) {
@@ -353,7 +353,7 @@ class lamList {
 				$value = " value=\"" . $_POST["filter" . strtolower($this->attrArray[$k])] . "\"";
 			}
 			echo "<td align=\"left\">";
-			echo "<input style=\"margin-right: 10px;\" type=\"text\" size=15 name=\"filter" . strtolower ($this->attrArray[$k]) ."\"" . $value . " onkeypress=\"SubmitForm('apply_filter', event)\">";
+			echo "<input style=\"margin-right: 10px;\" type=\"text\" size=15 name=\"filter" . strtolower ($this->attrArray[$k]) ."\"" . $value . " onkeypress=\"SubmitForm('apply_filter', event);\">";
 			echo "</td>\n";
 		}
 		echo "</tr></thead>\n";
diff --git a/lam/templates/lib/500_lam.js b/lam/templates/lib/500_lam.js
index b3f58572..c8e4f6af 100644
--- a/lam/templates/lib/500_lam.js
+++ b/lam/templates/lib/500_lam.js
@@ -103,9 +103,16 @@ function listShowSettingsDialog(title, okText, cancelText) {
 
 function SubmitForm(id, e) {
 	if (e.keyCode == 13) {
+		if (e.preventDefault) {
+			e.preventDefault();
+		}
+		if (e.returnValue) {
+			e.returnValue = false;
+		}
 		document.getElementsByName(id)[0].click();
 		return false;
 	}
+	return true;
 }
 
 function addResizeHandler(item, min, max) {