diff --git a/admin-dev/themes/template/toolbar.tpl b/admin-dev/themes/template/toolbar.tpl
index 3d480b476..796a9ef77 100644
--- a/admin-dev/themes/template/toolbar.tpl
+++ b/admin-dev/themes/template/toolbar.tpl
@@ -78,22 +78,24 @@
 
 				//submit the form
 				{block name=formSubmit}
-					btn_save.click(function() {
+				btn_save.click(function() {
+					//add hidden input to emulate submit button click when posting the form -> field name posted
+					btn_submit.before('<input type="hidden" name="'+btn_submit.attr("name")+'" value="1" />');
+
+					$('#{$table}_form').submit();
+					return false;
+				});
+
+				if (btn_save_and_stay)
+				{
+					btn_save_and_stay.click(function() {
 						//add hidden input to emulate submit button click when posting the form -> field name posted
-						btn_submit.before('<input type="hidden" name="'+btn_submit.attr("name")+'" value="1" />');
+						btn_submit.before('<input type="hidden" name="'+btn_submit.attr("name")+'AndStay" value="1" />');
 
 						$('#{$table}_form').submit();
+						return false;
 					});
-
-					if (btn_save_and_stay)
-					{
-						btn_save_and_stay.click(function() {
-							//add hidden input to emulate submit button click when posting the form -> field name posted
-							btn_submit.before('<input type="hidden" name="'+btn_submit.attr("name")+'AndStay" value="1" />');
-
-							$('#{$table}_form').submit();
-						});
-					}
+				}
 				{/block}
 			}
 		});