diff --git a/module/applications/characterCreation/characterCreation.mjs b/module/applications/characterCreation/characterCreation.mjs
index 693f6c5a..f9f832e8 100644
--- a/module/applications/characterCreation/characterCreation.mjs
+++ b/module/applications/characterCreation/characterCreation.mjs
@@ -494,7 +494,9 @@ export default class DhCharacterCreation extends HandlebarsApplicationMixin(Appl
         this.render();
     }
 
-    static async finish() {
+    static async finish(_, button) {
+        button.disabled = true;
+
         const primaryAncestryFeature = this.setup.primaryAncestry.system.primaryFeature;
         const secondaryAncestryFeature = this.setup.secondaryAncestry?.uuid
             ? this.setup.secondaryAncestry.system.secondaryFeature
diff --git a/module/applications/levelup/levelup.mjs b/module/applications/levelup/levelup.mjs
index 4cca1194..0b3f8970 100644
--- a/module/applications/levelup/levelup.mjs
+++ b/module/applications/levelup/levelup.mjs
@@ -650,7 +650,9 @@ export default class DhlevelUp extends HandlebarsApplicationMixin(ApplicationV2)
         this.render();
     }
 
-    static async save() {
+    static async save(_, button) {
+        button.disabled = true;
+
         const levelupData = Object.keys(this.levelup.levels).reduce((acc, level) => {
             if (level >= this.levelup.startLevel) {
                 acc[level] = this.levelup.levels[level].toObject();
diff --git a/system.json b/system.json
index b26bb543..d954c6d5 100644
--- a/system.json
+++ b/system.json
@@ -2,7 +2,7 @@
     "id": "daggerheart",
     "title": "Daggerheart",
     "description": "An unofficial implementation of the Daggerheart system",
-    "version": "1.0.4",
+    "version": "1.0.5",
     "compatibility": {
         "minimum": "13",
         "verified": "13.347",