diff --git a/packages/main/src/Button.ts b/packages/main/src/Button.ts
index e79bd3596cf8..065fd36eb9e4 100644
--- a/packages/main/src/Button.ts
+++ b/packages/main/src/Button.ts
@@ -444,6 +444,10 @@ class Button extends UI5Element implements IButton {
 			this.removeEventListener("click", this._onclickBound);
 			this._clickHandlerAttached = false;
 		}
+
+		if (activeButton === this) {
+			activeButton = null;
+		}
 	}
 
 	async onBeforeRendering() {