diff --git a/ui/media/js/image-editor.js b/ui/media/js/image-editor.js
index 8c246eab..b095d54d 100644
--- a/ui/media/js/image-editor.js
+++ b/ui/media/js/image-editor.js
@@ -512,13 +512,13 @@ class ImageEditor {
 	}
 	show() {
 		this.popup.classList.add("active")
-		document.addEventListener("keydown", this.keyHandlerBound)
-		document.addEventListener("keyup", this.keyHandlerBound)
+		document.addEventListener("keydown", this.keyHandlerBound, true)
+		document.addEventListener("keyup", this.keyHandlerBound, true)
 	}
 	hide() {
 		this.popup.classList.remove("active")
-		document.removeEventListener("keydown", this.keyHandlerBound)
-		document.removeEventListener("keyup", this.keyHandlerBound)
+		document.removeEventListener("keydown", this.keyHandlerBound, true)
+		document.removeEventListener("keyup", this.keyHandlerBound, true)
 	}
 	setSize(width, height) {
 		if (width == this.width && height == this.height) {
@@ -672,12 +672,18 @@ class ImageEditor {
 				else {
 					this.history.redo()
 				}
+				event.stopPropagation();
+				event.preventDefault();
 			}
 			if (event.key == "y" && event.ctrlKey) {
 				this.history.redo()
+				event.stopPropagation();
+				event.preventDefault();
 			}
 			if (event.key === "Escape") {
 				this.hide()
+				event.stopPropagation();
+				event.preventDefault();
 			}
 		}