diff --git a/modules/system/assets/ui/js/popup.js b/modules/system/assets/ui/js/popup.js
index c6b6b0ac0a..fa5297a56c 100644
--- a/modules/system/assets/ui/js/popup.js
+++ b/modules/system/assets/ui/js/popup.js
@@ -210,6 +210,15 @@
         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()
+                $(document.body).removeClass('modal-open')
+            }
+        });
+        
         return modal.append(modalDialog.append(modalContent))
     }