diff --git a/binaries/data/config/default.cfg b/binaries/data/config/default.cfg
index d5ea8d4d4d..154ab3c1fb 100644
--- a/binaries/data/config/default.cfg
+++ b/binaries/data/config/default.cfg
@@ -284,6 +284,7 @@ queue = Shift                ; Modifier to queue unit orders instead of replacin
 batchtrain = Shift           ; Modifier to train units in batches
 massbarter = Shift           ; Modifier to barter bunch of resources
 masstribute = Shift          ; Modifier to tribute bunch of resources
+noconfirmation = Shift       ; Do not ask confirmation when deleting a building/unit
 fulltradeswap = Shift        ; Modifier to put the desired trade resource to 100%
 unloadtype = Shift           ; Modifier to unload all units of type
 deselectgroup = Ctrl         ; Modifier to deselect units when clicking group icon, instead of selecting
@@ -292,7 +293,7 @@ rotate.ccw = LeftBracket     ; Rotate building placement preview anticlockwise
 
 [hotkey.session.savedgames]
 delete = Delete               ; Delete the selected saved game asking confirmation
-noConfirmation = Shift        ; Do not ask confirmation when deleting a game
+noconfirmation = Shift        ; Do not ask confirmation when deleting a game
 
 [hotkey.session.queueunit]   ; > UNIT TRAINING
 1 = "Z"            ; add first unit type to queue
diff --git a/binaries/data/mods/public/gui/credits/texts/programming.json b/binaries/data/mods/public/gui/credits/texts/programming.json
index 5d921e5a9c..97ba25ef8b 100644
--- a/binaries/data/mods/public/gui/credits/texts/programming.json
+++ b/binaries/data/mods/public/gui/credits/texts/programming.json
@@ -161,6 +161,7 @@
 			{"name": "Rolf Sievers"},
 			{"nick": "s0600204", "name": "Matthew Norwood"},
 			{"nick": "SafaAlfulaij"},
+			{"nick": "Sandarac"},
 			{"nick": "sanderd17", "name": "Sander Deryckere"},
 			{"nick": "sathyam", "name": "Sathyam Vellal"},
 			{"nick": "sbte", "name": "Sven Baars"},
diff --git a/binaries/data/mods/public/gui/replaymenu/replay_actions.js b/binaries/data/mods/public/gui/replaymenu/replay_actions.js
index 96a0955447..a065c3cb58 100644
--- a/binaries/data/mods/public/gui/replaymenu/replay_actions.js
+++ b/binaries/data/mods/public/gui/replaymenu/replay_actions.js
@@ -133,7 +133,7 @@ function deleteReplayButtonPressed()
 	if (!Engine.GetGUIObjectByName("deleteReplayButton").enabled)
 		return;
 
-	if (Engine.HotkeyIsPressed("session.savedgames.noConfirmation"))
+	if (Engine.HotkeyIsPressed("session.savedgames.noconfirmation"))
 		deleteReplayWithoutConfirmation();
 	else
 		deleteReplay();
diff --git a/binaries/data/mods/public/gui/savedgames/load.xml b/binaries/data/mods/public/gui/savedgames/load.xml
index ac99ce9a77..3b7767f149 100644
--- a/binaries/data/mods/public/gui/savedgames/load.xml
+++ b/binaries/data/mods/public/gui/savedgames/load.xml
@@ -31,7 +31,7 @@
 			<action on="Press">
 				if (!this.enabled)
 					return;
-				if (Engine.HotkeyIsPressed("session.savedgames.noConfirmation"))
+				if (Engine.HotkeyIsPressed("session.savedgames.noconfirmation"))
 					deleteGameWithoutConfirmation();
 				else
 					deleteGame();
diff --git a/binaries/data/mods/public/gui/session/unit_actions.js b/binaries/data/mods/public/gui/session/unit_actions.js
index 4197b7698a..5a423292ae 100644
--- a/binaries/data/mods/public/gui/session/unit_actions.js
+++ b/binaries/data/mods/public/gui/session/unit_actions.js
@@ -1022,8 +1022,13 @@ var g_EntityCommands =
 			let selection = g_Selection.toList();
 			if (!selection.length)
 				return;
-
-			openDeleteDialog(selection);
+			if (Engine.HotkeyIsPressed("session.noconfirmation"))
+				Engine.PostNetworkCommand({
+					"type": "delete-entities",
+					"entities": selection
+				});
+			else
+				openDeleteDialog(selection);
 		},
 	},
 	"stop": {