diff --git a/public/plugins/vue/tt-components/tt-modal.js b/public/plugins/vue/tt-components/tt-modal.js
index 9aee9e7af..5d99493f9 100644
--- a/public/plugins/vue/tt-components/tt-modal.js
+++ b/public/plugins/vue/tt-components/tt-modal.js
@@ -1,12 +1,12 @@
 Vue.component('tt-modal', {
     props:      {
-        show:       {type: Boolean, default: false},
-        title:      {type: String, default: 'Überschrift'},
-        delete:     {type: Boolean, default: true},
-        deleteText: {type: String, default: 'Löschen'},
-        save:       {type: Boolean, default: true},
+        show:        {type: Boolean, default: false},
+        title:       {type: String, default: 'Überschrift'},
+        delete:      {type: Boolean, default: true},
+        deleteText:  {type: String, default: 'Löschen'},
+        save:        {type: Boolean, default: true},
         saveLoading: {type: Boolean, default: false},
-        saveText:   {type: String, default: 'Speichern'},
+        saveText:    {type: String, default: 'Speichern'},
     }, watch:   {
         show(newVal) {
             if (!newVal) {
@@ -50,35 +50,41 @@ Vue.component('tt-modal', {
         return {window: window, isMobile: navigator.userAgent.match(/(iPad)|(iPhone)|(iPod)|(android)|(webOS)/i) !== null}
     },
     //language=Vue
-    template:   `
-                  <div class="modal show d-block"
-                       role="dialog"
-                       tabindex="-1"
-                       style="background: rgba(0, 0, 0, 0.5);"
-                       ref="modal"
-                       @keydown.esc="$emit('update:show', false)"
-                       v-if="show">
-                    <div class="modal-dialog modal-lg modal-dialog-scrollable" role="document" @mousedown.stop>
-                      <div class="modal-content" style="min-height: 45vh;">
-                        <div class="modal-header">
-                          <h5 class="modal-title">{{title}}</h5>
-                          <button type="button" class="close" @click="$emit('update:show', false)">
-                            <span aria-hidden="true">&times;</span>
+    template: `
+                <div class="modal show d-block"
+                     role="dialog"
+                     tabindex="-1"
+                     style="background: rgba(0, 0, 0, 0.5);"
+                     ref="modal"
+                     @keydown.esc="$emit('update:show', false)"
+                     v-if="show">
+                  <div class="modal-dialog modal-lg modal-dialog-scrollable" role="document" @mousedown.stop>
+                    <div class="modal-content" style="min-height: 45vh;">
+                      <div class="modal-header">
+                        <h5 class="modal-title">{{title}}</h5>
+                        <button type="button" class="close" @click="$emit('update:show', false)">
+                          <span aria-hidden="true">&times;</span>
+                        </button>
+                      </div>
+                      <div class="modal-body">
+                        <slot></slot>
+                      </div>
+                      <div class="modal-footer">
+                        <slot name="footer">
+                          <slot name="footer-prepend"></slot>
+                          <button v-if="save" class="btn btn-primary position-relative" @click="$emit('submit')" :disabled="saveLoading">
+                            <span v-if="!saveLoading">{{ saveText }}</span>
+                            <span v-if="saveLoading" class="top-50 start-50 translate-middle">
+                              <span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
+                              <span class="sr-only">Loading...</span>
+                            </span>
                           </button>
-                        </div>
-                        <div class="modal-body">
-                          <slot></slot>
-                        </div>
-                        <div class="modal-footer">
-                          <slot name="footer">
-                            <slot name="footer-prepend"></slot>
-                            <button v-if="save" class="btn btn-primary" @click="$emit('submit')">{{saveText}}</button>
-                            <button v-if="$props.delete" class="btn btn-danger" @click="$emit('delete')">{{deleteText}}</button>
-                            <button class="btn btn-secondary" @click="$emit('update:show', false)">Schließen</button>
-                          </slot>
-                        </div>
+                          <button v-if="$props.delete" class="btn btn-danger" @click="$emit('delete')">{{deleteText}}</button>
+                          <button class="btn btn-secondary" @click="$emit('update:show', false)">Schließen</button>
+                        </slot>
                       </div>
                     </div>
                   </div>
-                `
+                </div>
+              `
 })