diff --git a/webui/components/modals/file-browser/rename-modal.html b/webui/components/modals/file-browser/rename-modal.html
index 6f0367f9a..163449484 100644
--- a/webui/components/modals/file-browser/rename-modal.html
+++ b/webui/components/modals/file-browser/rename-modal.html
@@ -30,8 +30,8 @@
 
   <template x-if="$store.fileBrowser">
     <div class="modal-footer" data-modal-footer>
-      <button class="btn btn-cancel" @click="$store.fileBrowser.closeRenameModal()" :disabled="$store.fileBrowser.isRenaming">Cancel</button>
       <button class="btn btn-ok" @click="$store.fileBrowser.confirmRename()" :disabled="$store.fileBrowser.isRenaming || !$store.fileBrowser.renameName.trim()" x-text="$store.fileBrowser.renameMode === 'create-folder' ? 'Create Folder' : 'Rename'"></button>
+      <button class="btn btn-cancel" @click="$store.fileBrowser.closeRenameModal()" :disabled="$store.fileBrowser.isRenaming">Cancel</button>
     </div>
   </template>
 
diff --git a/webui/components/modals/file-editor/file-edit-modal.html b/webui/components/modals/file-editor/file-edit-modal.html
index 6927a6779..601c3befa 100644
--- a/webui/components/modals/file-editor/file-edit-modal.html
+++ b/webui/components/modals/file-editor/file-edit-modal.html
@@ -48,13 +48,13 @@
 
   <template x-if="$store.fileEditor">
     <div class="modal-footer" data-modal-footer>
-      <button class="btn btn-cancel" @click="$store.fileEditor.closeFileEditor()" :disabled="$store.fileEditor.isSaving">Cancel</button>
       <button
         class="btn btn-ok"
         @click="$store.fileEditor.saveFileEdits()"
         :disabled="$store.fileEditor.isSaving || $store.fileEditor.isEditLoading || $store.fileEditor.editError"
         x-text="$store.fileEditor.isSaving ? 'Saving…' : 'Save'"
       ></button>
+      <button class="btn btn-cancel" @click="$store.fileEditor.closeFileEditor()" :disabled="$store.fileEditor.isSaving">Cancel</button>
     </div>
   </template>
 
diff --git a/webui/components/modals/scheduler/scheduler-modal.html b/webui/components/modals/scheduler/scheduler-modal.html
index 981d05a35..6af50efbe 100644
--- a/webui/components/modals/scheduler/scheduler-modal.html
+++ b/webui/components/modals/scheduler/scheduler-modal.html
@@ -28,10 +28,10 @@
                     @click="$confirmClick($event, () => $store.schedulerStore.deleteTask($store.schedulerStore.editingTask.uuid))">Delete</button>
           </div>
           <div class="buttons-right">
-            <button type="button" class="button cancel"
-                    @click="$store.schedulerStore.cancelEdit()">Cancel</button>
             <button type="button" class="button confirm"
                     @click="$store.schedulerStore.saveTask()">Save</button>
+            <button type="button" class="button cancel"
+                    @click="$store.schedulerStore.cancelEdit()">Cancel</button>
           </div>
         </div>
       </div>
diff --git a/webui/components/modals/scheduler/scheduler-task-editor.html b/webui/components/modals/scheduler/scheduler-task-editor.html
index 644816647..761e445a7 100644
--- a/webui/components/modals/scheduler/scheduler-task-editor.html
+++ b/webui/components/modals/scheduler/scheduler-task-editor.html
@@ -16,10 +16,10 @@
                 <div class="buttons-container scheduler-editor-actions scheduler-editor-actions-top">
                     <div class="buttons-left"></div>
                     <div class="buttons-right">
-                        <button type="button" class="button cancel"
-                                @click="$store.schedulerStore.cancelEdit()">Cancel</button>
                         <button type="button" class="button confirm"
                                 @click="$store.schedulerStore.saveTask()">Save</button>
+                        <button type="button" class="button cancel"
+                                @click="$store.schedulerStore.cancelEdit()">Cancel</button>
                     </div>
                 </div>
 
@@ -226,10 +226,10 @@
                                 @click="$confirmClick($event, () => $store.schedulerStore.deleteTask($store.schedulerStore.editingTask.uuid))">Delete</button>
                     </div>
                     <div class="buttons-right">
-                        <button type="button" class="button cancel"
-                                @click="$store.schedulerStore.cancelEdit()">Cancel</button>
                         <button type="button" class="button confirm"
                                 @click="$store.schedulerStore.saveTask()">Save</button>
+                        <button type="button" class="button cancel"
+                                @click="$store.schedulerStore.cancelEdit()">Cancel</button>
                     </div>
                 </div>
 
diff --git a/webui/components/plugins/plugin-settings.html b/webui/components/plugins/plugin-settings.html
index d80c9c10f..fcf7f3d07 100644
--- a/webui/components/plugins/plugin-settings.html
+++ b/webui/components/plugins/plugin-settings.html
@@ -140,10 +140,6 @@
                             :disabled="context?.isSaving || context?.isLoading">
                         Default
                     </button>
-                    <button class="btn btn-cancel"
-                            @click="window.closeModal?.()">
-                        Cancel
-                    </button>
                     <button class="btn btn-field"
                             x-show="context.wizardFooter?.showNext?.()"
                             @click="context.wizardFooter?.onNext?.()"
@@ -156,6 +152,10 @@
                             :disabled="context?.isSaving || context?.isLoading">
                         Save
                     </button>
+                    <button class="btn btn-cancel"
+                            @click="window.closeModal?.()">
+                        Cancel
+                    </button>
                 </div>
             </div>
             </div>
diff --git a/webui/components/projects/project-create.html b/webui/components/projects/project-create.html
index 2c734b4ed..8a82de463 100644
--- a/webui/components/projects/project-create.html
+++ b/webui/components/projects/project-create.html
@@ -37,9 +37,6 @@
                     </template>
 
                     <div class="buttons-right">
-                        <button type="button" class="button cancel"
-                            @click="$store.projects.cancelCreate()"
-                            :disabled="$store.projects.selectedProject._cloning">Cancel</button>
                         <button type="button" class="button confirm" 
                             @click="$store.projects.confirmCreate()"
                             :disabled="$store.projects.selectedProject._cloning">
@@ -53,6 +50,9 @@
                                 <span x-text="$store.projects.selectedProject.git_url ? 'Clone and continue' : 'Create and continue'"></span>
                             </template>
                         </button>
+                        <button type="button" class="button cancel"
+                            @click="$store.projects.cancelCreate()"
+                            :disabled="$store.projects.selectedProject._cloning">Cancel</button>
                     </div>
                 </div>
 
diff --git a/webui/components/projects/project-edit.html b/webui/components/projects/project-edit.html
index ab1eb602e..63871893e 100644
--- a/webui/components/projects/project-edit.html
+++ b/webui/components/projects/project-edit.html
@@ -19,10 +19,10 @@
                             @click="$confirmClick($event, () => $store.projects.deleteProjectAndCloseModal())">Delete</button>
                     </div>
                     <div class="buttons-right">
-                        <button type="button" class="button cancel"
-                            @click="$store.projects.cancelEdit()">Cancel</button>
                         <button type="button" class="button confirm"
                             @click="$store.projects.confirmEdit()">Save</button>
+                        <button type="button" class="button cancel"
+                            @click="$store.projects.cancelEdit()">Cancel</button>
                     </div>
                 </div>
 
@@ -85,10 +85,10 @@
                             @click="$confirmClick($event, () => $store.projects.deleteProjectAndCloseModal())">Delete</button>
                     </div>
                     <div class="buttons-right">
-                        <button type="button" class="button cancel"
-                            @click="$store.projects.cancelEdit()">Cancel</button>
                         <button type="button" class="button confirm"
                             @click="$store.projects.confirmEdit()">Save</button>
+                        <button type="button" class="button cancel"
+                            @click="$store.projects.cancelEdit()">Cancel</button>
                     </div>
                 </div>