diff --git a/app/javascript/template_builder/builder.vue b/app/javascript/template_builder/builder.vue
index a834e373..f0146f39 100644
--- a/app/javascript/template_builder/builder.vue
+++ b/app/javascript/template_builder/builder.vue
@@ -3525,6 +3525,8 @@ export default {
         this.onChange(this.template)
       }
 
+      this.pushUndo()
+
       if (!this.autosave && !force) {
         return Promise.resolve({})
       }
@@ -3535,8 +3537,6 @@ export default {
         }
       })
 
-      this.pushUndo()
-
       return this.baseFetch(`/templates/${this.template.id}`, {
         method: 'PUT',
         body: JSON.stringify({