diff --git a/client/src/index.ts b/client/src/index.ts
index b3e7e63e..0e927822 100644
--- a/client/src/index.ts
+++ b/client/src/index.ts
@@ -94,6 +94,7 @@ function readConfig(config: any) {
 }
 
 function setupEvents() {
+
     /* Generic clicks */
     document.addEventListener("click", (ev) => {
         if (ev instanceof MouseEvent && ev.target instanceof HTMLElement) {
diff --git a/client/src/units/unit.ts b/client/src/units/unit.ts
index 82d10681..6b3830c6 100644
--- a/client/src/units/unit.ts
+++ b/client/src/units/unit.ts
@@ -371,7 +371,6 @@ export class Unit extends Marker {
     }
 
     delete() {
-        // TODO: add confirmation popup
         deleteUnit(this.ID);
     }
 
diff --git a/client/src/units/unitsmanager.ts b/client/src/units/unitsmanager.ts
index 62ac5db6..9c05e34b 100644
--- a/client/src/units/unitsmanager.ts
+++ b/client/src/units/unitsmanager.ts
@@ -19,7 +19,7 @@ export class UnitsManager {
         document.addEventListener('paste', () => this.pasteUnits());
         document.addEventListener('unitSelection', (e: CustomEvent) => this.#onUnitSelection(e.detail));
         document.addEventListener('unitDeselection', (e: CustomEvent) => this.#onUnitDeselection(e.detail));
-        document.addEventListener('keydown', (event) => this.#onKeyDown(event));
+        document.addEventListener('keyup', (event) => this.#onKeyUp(event));
         document.addEventListener('deleteSelectedUnits', () => this.selectedUnitsDelete())
     }
 
@@ -329,8 +329,8 @@ export class UnitsManager {
     }
 
     /***********************************************/
-    #onKeyDown(event: KeyboardEvent) {
-        if (!keyEventWasInInput(event) && event.key === "Delete") {
+    #onKeyUp(event: KeyboardEvent) {
+        if (!keyEventWasInInput(event) && event.key === "Delete" && confirm( "Are you sure you want to delete?" ) ) {
             this.selectedUnitsDelete();
         }
     }