diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFilter.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFilter.html
index 6a773754e..59438995a 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFilter.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFilter.html
@@ -5,7 +5,7 @@
 		<span data-i18n="POPUPS_FILTER/TITLE_EDIT_FILTER" data-bind="visible: !isNew()"></span>
 	</h3>
 </header>
-<form class="modal-body" spellcheck="false" data-bind="with: filter">
+<form id="sieve-script-filter" class="modal-body" spellcheck="false" data-bind="submit: saveFilter, with: filter">
 	<div class="control-group" data-bind="css: {'error': nameError}">
 		<input type="text" class="span5"
 			data-bind="value: name"
@@ -40,5 +40,5 @@
 	<div data-bind="template: {'name': actionTemplate()}, i18nUpdate: actionTemplate"></div>
 </form>
 <footer>
-	<a class="btn buttonSave" data-bind="click: saveFilter" data-icon="✔" data-i18n="GLOBAL/DONE"></a>
+	<button class="btn buttonSave" form="sieve-script-filter" data-icon="✔" data-i18n="GLOBAL/DONE"></button>
 </footer>