diff --git a/app/assets/javascripts/discourse/app/components/d-lightbox.js b/app/assets/javascripts/discourse/app/components/d-lightbox.js
index fa6bc0cae23..f821fa32fe5 100644
--- a/app/assets/javascripts/discourse/app/components/d-lightbox.js
+++ b/app/assets/javascripts/discourse/app/components/d-lightbox.js
@@ -361,6 +361,7 @@ export default class DLightbox extends Component {
   onKeydown(event) {
     if (event.key === KEYBOARD_SHORTCUTS.CLOSE) {
       event.preventDefault();
+      event.stopPropagation();
       return this.close();
     }
   }