diff --git a/app/assets/javascripts/discourse/templates/modal/auto_close.js.handlebars b/app/assets/javascripts/discourse/templates/modal/auto_close.js.handlebars
index ce11d43a6bb..afd3f4392ea 100644
--- a/app/assets/javascripts/discourse/templates/modal/auto_close.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/modal/auto_close.js.handlebars
@@ -1,10 +1,10 @@
-<div class="modal-body">
-  <form>
+<form {{action saveAutoClose on="submit"}}>
+  <div class="modal-body">
     {{auto-close-form autoCloseTime=auto_close_time autoCloseValid=auto_close_valid}}
-  </form>
-</div>
-<div class="modal-footer">
-  <button class='btn btn-primary' {{action saveAutoClose}} {{bindAttr disabled="auto_close_invalid"}}>{{i18n topic.auto_close_save}}</button>
-  <a {{action closeModal}}>{{i18n cancel}}</a>
-  <button class='btn pull-right' {{action removeAutoClose}}>{{i18n topic.auto_close_remove}}</button>
-</div>
+  </div>
+  <div class="modal-footer">
+    <button class='btn btn-primary' type='submit' {{bindAttr disabled="auto_close_invalid"}}>{{i18n topic.auto_close_save}}</button>
+    <a {{action closeModal}}>{{i18n cancel}}</a>
+    <button class='btn pull-right' {{action removeAutoClose}}>{{i18n topic.auto_close_remove}}</button>
+  </div>
+</form>