diff --git a/classes/Pref_Feeds.php b/classes/Pref_Feeds.php
index 36c9bcbc5..8f6423801 100644
--- a/classes/Pref_Feeds.php
+++ b/classes/Pref_Feeds.php
@@ -904,10 +904,12 @@ class Pref_Feeds extends Handler_Protected {
 		<div dojoType="dijit.layout.BorderContainer" gutters="false">
 			<div region='top' dojoType="fox.Toolbar">
 				<div style='float : right'>
-					<input dojoType="dijit.form.TextBox" id="feed_search" size="20" type="search"
-						value="<?= htmlspecialchars($feed_search) ?>">
-					<button dojoType="dijit.form.Button" onclick="dijit.byId('feedTree').reload()">
-						<?= __('Search') ?></button>
+					<form dojoType="dijit.form.Form" onsubmit="dijit.byId('feedTree').reload(); return false;">
+						<input dojoType="dijit.form.TextBox" id="feed_search" size="20" type="search"
+							value="<?= htmlspecialchars($feed_search) ?>">
+						<button dojoType="dijit.form.Button" type="submit">
+							<?= __('Search') ?></button>
+					</form>
 				</div>
 
 				<div dojoType="fox.form.DropDownButton">
diff --git a/classes/Pref_Filters.php b/classes/Pref_Filters.php
index 1656e92b8..7a477d7db 100644
--- a/classes/Pref_Filters.php
+++ b/classes/Pref_Filters.php
@@ -665,10 +665,12 @@ class Pref_Filters extends Handler_Protected {
 				<div dojoType='fox.Toolbar'>
 
 					<div style='float : right; padding-right : 4px;'>
-						<input dojoType="dijit.form.TextBox" id="filter_search" size="20" type="search"
-							value="<?= htmlspecialchars($filter_search) ?>">
-						<button dojoType="dijit.form.Button" onclick="dijit.byId('filterTree').reload()">
-							<?= __('Search') ?></button>
+						<form dojoType="dijit.form.Form" onsubmit="dijit.byId('filterTree').reload(); return false;">
+							<input dojoType="dijit.form.TextBox" id="filter_search" size="20" type="search"
+								value="<?= htmlspecialchars($filter_search) ?>">
+							<button dojoType="dijit.form.Button" type="submit">
+								<?= __('Search') ?></button>
+						</form>
 					</div>
 
 					<div dojoType="fox.form.DropDownButton">
diff --git a/classes/Pref_Users.php b/classes/Pref_Users.php
index 78291592d..9532bded5 100644
--- a/classes/Pref_Users.php
+++ b/classes/Pref_Users.php
@@ -210,11 +210,13 @@ class Pref_Users extends Handler_Administrative {
 					<div dojoType='fox.Toolbar'>
 
 						<div style='float : right'>
-							<input dojoType='dijit.form.TextBox' id='user_search' size='20' type='search'
-								value="<?= htmlspecialchars($user_search) ?>">
-							<button dojoType='dijit.form.Button' onclick='Users.reload()'>
-								<?= __('Search') ?>
-							</button>
+							<form dojoType="dijit.form.Form" onsubmit="Users.reload(); return false;">
+								<input dojoType='dijit.form.TextBox' id='user_search' size='20' type='search'
+									value="<?= htmlspecialchars($user_search) ?>">
+								<button dojoType='dijit.form.Button' type='submit'>
+									<?= __('Search') ?>
+								</button>
+							</form>
 						</div>
 
 						<div dojoType='fox.form.DropDownButton'>