diff --git a/client/components/ContextMenu.vue b/client/components/ContextMenu.vue
index fc64b88d..89e434e6 100644
--- a/client/components/ContextMenu.vue
+++ b/client/components/ContextMenu.vue
@@ -38,11 +38,7 @@ export default {
 		};
 	},
 	mounted() {
-		document.addEventListener("keydown", (e) => {
-			if (e.code === "Escape") {
-				this.close();
-			}
-		});
+		Mousetrap.bind("esc", this.close);
 
 		const trap = Mousetrap(this.$refs.contextMenu);
 
@@ -78,6 +74,9 @@ export default {
 			return false;
 		});
 	},
+	destroyed() {
+		Mousetrap.unbind("esc", this.close);
+	},
 	methods: {
 		open(event, items) {
 			this.items = items;
diff --git a/client/components/ImageViewer.vue b/client/components/ImageViewer.vue
index f572d0b6..0e10c5d6 100644
--- a/client/components/ImageViewer.vue
+++ b/client/components/ImageViewer.vue
@@ -25,6 +25,8 @@
 </template>
 
 <script>
+import Mousetrap from "mousetrap";
+
 export default {
 	name: "ImageViewer",
 	data() {
@@ -61,14 +63,17 @@ export default {
 		},
 	},
 	mounted() {
-		document.addEventListener("keydown", (e) => {
-			if (e.code === "Escape") {
-				this.closeViewer();
-			}
-		});
+		Mousetrap.bind("esc", this.closeViewer);
+	},
+	destroyed() {
+		Mousetrap.unbind("esc", this.closeViewer);
 	},
 	methods: {
 		closeViewer() {
+			if (this.link === null) {
+				return;
+			}
+
 			this.$root.$off("resize", this.correctPosition);
 			this.link = null;
 		},