diff --git a/modules/cms/assets/js/october.cmspage.js b/modules/cms/assets/js/october.cmspage.js
index 0c28f5aa8..af1efc8a9 100644
--- a/modules/cms/assets/js/october.cmspage.js
+++ b/modules/cms/assets/js/october.cmspage.js
@@ -281,12 +281,6 @@
     CmsPage.prototype.onAjaxSuccess = function(ev, context, data) {
         var element = ev.target
 
-        // Reload the form if the server has requested it
-        if (data.forceReload) {
-            this.reloadForm(element)
-            return;
-        }
-
         // Update the visibilities of the commit & reset buttons
         $('[data-control=commit-button]', element).toggleClass('hide', !data.canCommit)
         $('[data-control=reset-button]', element).toggleClass('hide', !data.canReset)
@@ -325,6 +319,11 @@
         if (context.handler == 'onSave' && (!data['X_OCTOBER_ERROR_FIELDS'] && !data['X_OCTOBER_ERROR_MESSAGE'])) {
             $(element).trigger('unchange.oc.changeMonitor')
         }
+
+        // Reload the form if the server has requested it
+        if (data.forceReload) {
+            this.reloadForm(element)
+        }
     }
 
     CmsPage.prototype.onAjaxError = function(ev, context, message, data, jqXHR) {
diff --git a/modules/cms/controllers/Index.php b/modules/cms/controllers/Index.php
index 6f29b0429..82aca30b4 100644
--- a/modules/cms/controllers/Index.php
+++ b/modules/cms/controllers/Index.php
@@ -421,7 +421,6 @@ class Index extends Controller
     {
         $this->validateRequestTheme();
         $type = Request::input('templateType');
-
         $template = $this->loadTemplate($type, trim(Request::input('templatePath')));
 
         if ($this->canResetTemplate($template)) {
diff --git a/modules/cms/controllers/index/_button_commit.htm b/modules/cms/controllers/index/_button_commit.htm
new file mode 100644
index 000000000..cf08583dd
--- /dev/null
+++ b/modules/cms/controllers/index/_button_commit.htm
@@ -0,0 +1,9 @@
+<button
+    type="button"
+    class="btn btn-danger oc-icon-download <?php if (!$canCommit): ?>hide<?php endif ?>"
+    data-request="onCommit"
+    data-request-confirm="<?= e(trans('cms::lang.editor.commit_confirm')) ?>"
+    data-load-indicator="<?= e(trans('cms::lang.editor.committing')) ?>"
+    data-control="commit-button">
+    <?= e(trans('cms::lang.editor.commit')) ?>
+</button>
\ No newline at end of file
diff --git a/modules/cms/controllers/index/_button_reset.htm b/modules/cms/controllers/index/_button_reset.htm
new file mode 100644
index 000000000..eac4f53d4
--- /dev/null
+++ b/modules/cms/controllers/index/_button_reset.htm
@@ -0,0 +1,9 @@
+<button
+    type="button"
+    class="btn btn-danger oc-icon-bomb <?php if (!$canReset): ?>hide<?php endif ?>"
+    data-request="onReset"
+    data-request-confirm="<?= e(trans('cms::lang.editor.reset_confirm')) ?>"
+    data-load-indicator="<?= e(trans('cms::lang.editor.resetting')) ?>"
+    data-control="reset-button">
+    <?= e(trans('cms::lang.editor.reset')) ?>
+</button>
\ No newline at end of file
diff --git a/modules/cms/controllers/index/_common_toolbar_actions.htm b/modules/cms/controllers/index/_common_toolbar_actions.htm
index 07aaa19c4..e26bbf6f8 100644
--- a/modules/cms/controllers/index/_common_toolbar_actions.htm
+++ b/modules/cms/controllers/index/_common_toolbar_actions.htm
@@ -1,22 +1,6 @@
-<button
-    type="button"
-    class="btn btn-danger oc-icon-download <?php if (!$canCommit): ?>hide<?php endif ?>"
-    data-request="onCommit"
-    data-request-confirm="<?= e(trans('cms::lang.editor.commit_confirm')) ?>"
-    data-load-indicator="<?= e(trans('cms::lang.editor.committing')) ?>"
-    data-control="commit-button">
-    <?= e(trans('cms::lang.editor.commit')) ?>
-    </button>
+<?= $this->makePartial('button_commit'); ?>
 
-<button
-    type="button"
-    class="btn btn-danger oc-icon-bomb <?php if (!$canReset): ?>hide<?php endif ?>"
-    data-request="onReset"
-    data-request-confirm="<?= e(trans('cms::lang.editor.reset_confirm')) ?>"
-    data-load-indicator="<?= e(trans('cms::lang.editor.resetting')) ?>"
-    data-control="reset-button">
-    <?= e(trans('cms::lang.editor.reset')) ?>
-</button>
+<?= $this->makePartial('button_reset'); ?>
 
 <button
     type="button"