diff --git a/packages/main/src/Popup.js b/packages/main/src/Popup.js
index c8533a2f76d9..716d1c0d184c 100644
--- a/packages/main/src/Popup.js
+++ b/packages/main/src/Popup.js
@@ -207,7 +207,7 @@ class Popup extends UI5Element {
 	/**
 	 * Prevents the user from interacting with the content under the block layer
 	 */
-	_onBlockLayerKeyDown(event) {
+	_preventBlockLayerFocus(event) {
 		event.preventDefault();
 	}
 
diff --git a/packages/main/src/PopupBlockLayer.hbs b/packages/main/src/PopupBlockLayer.hbs
index d2b67251c4fb..050ec27b9773 100644
--- a/packages/main/src/PopupBlockLayer.hbs
+++ b/packages/main/src/PopupBlockLayer.hbs
@@ -2,5 +2,6 @@
     ?hidden={{_blockLayerHidden}}
     tabindex="1"
     style="{{styles.blockLayer}}"
-	@keydown="{{_onBlockLayerKeyDown}}">
+	@keydown="{{_preventBlockLayerFocus}}"
+    @mousedown="{{_preventBlockLayerFocus}}">
 </div>