From be6c57502df79e303d745ecf60698b6481aebb9b Mon Sep 17 00:00:00 2001
From: AIC BV <89913092+AIC-BV@users.noreply.github.com>
Date: Fri, 9 Feb 2024 14:04:48 +0100
Subject: [PATCH 1/2] Close popup when clicking next to it

---
 modules/system/assets/ui/js/popup.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/system/assets/ui/js/popup.js b/modules/system/assets/ui/js/popup.js
index c6b6b0ac0a..8f138928f8 100644
--- a/modules/system/assets/ui/js/popup.js
+++ b/modules/system/assets/ui/js/popup.js
@@ -210,6 +210,14 @@
         if (this.options.zIndex !== null)
             modal.css('z-index', this.options.zIndex + 20)
 
+        modal.on('click', function(e) {
+            const target = e.target;
+            if (target.classList.contains('control-popup')) {
+                modal.hide()
+                $('.popup-backdrop').remove()
+            }
+        });
+        
         return modal.append(modalDialog.append(modalContent))
     }
 

From db545f2b9d781be62b14e0345e2ef7b3cb9220a1 Mon Sep 17 00:00:00 2001
From: AIC BV <89913092+AIC-BV@users.noreply.github.com>
Date: Fri, 9 Feb 2024 14:50:52 +0100
Subject: [PATCH 2/2] [fix] make body scrollable

---
 modules/system/assets/ui/js/popup.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/system/assets/ui/js/popup.js b/modules/system/assets/ui/js/popup.js
index 8f138928f8..fa5297a56c 100644
--- a/modules/system/assets/ui/js/popup.js
+++ b/modules/system/assets/ui/js/popup.js
@@ -215,6 +215,7 @@
             if (target.classList.contains('control-popup')) {
                 modal.hide()
                 $('.popup-backdrop').remove()
+                $(document.body).removeClass('modal-open')
             }
         });