diff --git a/src/module/dialog/combatAction.mjs b/src/module/dialog/combatAction.mjs
index 4a7b6de3..6ae9e0cf 100644
--- a/src/module/dialog/combatAction.mjs
+++ b/src/module/dialog/combatAction.mjs
@@ -35,6 +35,7 @@ export class CombatActionDialog extends HandlebarsApplicationMixin(ApplicationV2
             selectTarget: CombatActionDialog.#onSelectTarget,
             selectWeaponAndSkill: CombatActionDialog.#onSelectWeaponAndSkill,
             selectManeuver: CombatActionDialog.#onSelectManeuver,
+            attack: CombatActionDialog.#onAttack
         }
     }
 
@@ -167,6 +168,10 @@ export class CombatActionDialog extends HandlebarsApplicationMixin(ApplicationV2
         CombatActionDialog._instance.#processOnSubmitForm(event, form, formData)
     }
 
+    static async #onAttack(event, target) {
+        CombatActionDialog._instance.#processOnSubmitForm(event, this.element, new FormData(this.element))
+    }
+
     _configureRenderOptions(options) {
         super._configureRenderOptions(options)
         if (options.window) {
diff --git a/src/module/dialog/defenseAction.mjs b/src/module/dialog/defenseAction.mjs
index 67b307cf..656bc9cd 100644
--- a/src/module/dialog/defenseAction.mjs
+++ b/src/module/dialog/defenseAction.mjs
@@ -34,6 +34,7 @@ export class DefenseActionDialog extends HandlebarsApplicationMixin(ApplicationV
         actions: {
             selectWeaponAndSkill: DefenseActionDialog.#onSelectWeaponAndSkill,
             selectManeuver: DefenseActionDialog.#onSelectManeuver,
+            defend: DefenseActionDialog.#onDefend,
         }
     }
 
@@ -104,6 +105,10 @@ export class DefenseActionDialog extends HandlebarsApplicationMixin(ApplicationV
         })
     }
 
+    static async #onDefend(event, target) {
+       this.element.submit()
+    }
+
     _configureRenderOptions(options) {
         super._configureRenderOptions(options)
 
diff --git a/src/templates/dialog/combat-action.hbs b/src/templates/dialog/combat-action.hbs
index 0974cefe..f32760b7 100644
--- a/src/templates/dialog/combat-action.hbs
+++ b/src/templates/dialog/combat-action.hbs
@@ -57,7 +57,7 @@
 
 
     <div class="actions">
-        <button type="button" {{#if ready}}class="ready" {{else}}data-tooltip="{{notReadyReason}}"{{/if}} type="submit"><i
+        <button type="button" data-action="attack" {{#if ready}}class="ready" {{else}}data-tooltip="{{notReadyReason}}"{{/if}}><i
                 class="fa-solid fa-swords"></i>Angreifen <span
                 class="value"></span></button>
     </div>
diff --git a/src/templates/dialog/defense-action.hbs b/src/templates/dialog/defense-action.hbs
index cfd94c2a..40ee4f3b 100644
--- a/src/templates/dialog/defense-action.hbs
+++ b/src/templates/dialog/defense-action.hbs
@@ -43,7 +43,7 @@
 
 
     <div class="actions">
-        <button type="button" {{#if ready}}class="ready" {{else}}data-tooltip="{{notReadyReason}}"{{/if}} type="submit"><i
+        <button type="button" data-action="defend" {{#if ready}}class="ready" {{else}}data-tooltip="{{notReadyReason}}"{{/if}}><i
                 class="fa-solid fa-shield"></i>Verteidigen <span
                 class="value"></span></button>
     </div>