diff --git a/classes/feeds.php b/classes/feeds.php
index 8c103828f..ebd1a1c9e 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -1161,7 +1161,7 @@ class Feeds extends Handler_Protected {
 				</div>";
 		}
 
-		print "<button dojoType=\"dijit.form.Button\" type=\"submit\" onclick=\"dijit.byId('searchDlg').execute()\">".__('Search')."</button>
+		print "<button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"primary\" onclick=\"dijit.byId('searchDlg').execute()\">".__('Search')."</button>
 		<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('searchDlg').hide()\">".__('Cancel')."</button>
 		</div>";
 
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index 74aecd309..f2de8c934 100755
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -521,13 +521,14 @@ class Pref_Filters extends Handler_Protected {
 			print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').test()\">".
 				__('Test')."</button> ";
 
-			print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').execute()\">".
+			print "<button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"primary\" onclick=\"return dijit.byId('filterEditDlg').execute()\">".
 				__('Save')."</button> ";
 
 			print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').hide()\">".
 				__('Cancel')."</button>";
 
 			print "</div>";
+			print "</form>";
 			
 		}
 	}
diff --git a/classes/pref/labels.php b/classes/pref/labels.php
index 38ec850a6..963ec41cd 100644
--- a/classes/pref/labels.php
+++ b/classes/pref/labels.php
@@ -20,6 +20,8 @@ class Pref_Labels extends Handler_Protected {
 			print_hidden("op", "pref-labels");
 			print_hidden("method", "save");
 
+			print "<form onsubmit='return false;'>";
+
 			print "<div class=\"dlgSec\">".__("Caption")."</div>";
 
 			print "<div class=\"dlgSecCont\">";
@@ -76,11 +78,13 @@ class Pref_Labels extends Handler_Protected {
 #			print "</form>";
 
 			print "<div class=\"dlgButtons\">";
-			print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('labelEditDlg').execute()\">".
+			print "<button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"primary\" onclick=\"dijit.byId('labelEditDlg').execute()\">".
 				__('Save')."</button>";
 			print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('labelEditDlg').hide()\">".
 				__('Cancel')."</button>";
 			print "</div>";
+
+			print "</form>";
 		}
 	}