diff --git a/client/components/ContextMenu.vue b/client/components/ContextMenu.vue
index d782d295..75b484f2 100644
--- a/client/components/ContextMenu.vue
+++ b/client/components/ContextMenu.vue
@@ -4,6 +4,10 @@
 		id="context-menu-container"
 		@click="containerClick"
 		@contextmenu.prevent="containerClick"
+		@keydown.exact.up.prevent="navigateMenu(-1)"
+		@keydown.exact.down.prevent="navigateMenu(1)"
+		@keydown.exact.tab.prevent="navigateMenu(1)"
+		@keydown.shift.tab.prevent="navigateMenu(-1)"
 	>
 		<ul
 			id="context-menu"
@@ -60,7 +64,6 @@ export default {
 	},
 	mounted() {
 		Mousetrap.bind("esc", this.close);
-		Mousetrap.bind(["up", "down", "tab", "shift+tab"], this.navigateMenu);
 
 		this.$root.$on("contextmenu:user", this.openUserContextMenu);
 		this.$root.$on("contextmenu:channel", this.openChannelContextMenu);
@@ -68,11 +71,12 @@ export default {
 	},
 	destroyed() {
 		Mousetrap.unbind("esc", this.close);
-		Mousetrap.unbind(["up", "down", "tab", "shift+tab"], this.navigateMenu);
 
 		this.$root.$off("contextmenu:user", this.openUserContextMenu);
 		this.$root.$off("contextmenu:channel", this.openChannelContextMenu);
 		this.$root.$off("contextmenu:removenetwork", this.openRemoveNetworkContextMenu);
+
+		this.close();
 	},
 	methods: {
 		openRemoveNetworkContextMenu(data) {
@@ -140,11 +144,7 @@ export default {
 				this.clickItem(this.items[this.activeItem]);
 			}
 		},
-		navigateMenu(event, key) {
-			event.preventDefault();
-
-			const direction = key === "down" || key === "tab" ? 1 : -1;
-
+		navigateMenu(direction) {
 			let currentIndex = this.activeItem;
 
 			currentIndex += direction;
diff --git a/client/js/keybinds.js b/client/js/keybinds.js
index a4d44052..fc7a1fa8 100644
--- a/client/js/keybinds.js
+++ b/client/js/keybinds.js
@@ -154,7 +154,7 @@ document.addEventListener("keydown", (e) => {
 
 	// Redirect pagedown/pageup keys to messages container so it scrolls
 	if (e.which === 33 || e.which === 34) {
-		const chat = document.querySelector("#windows .chat-content .chat");
+		const chat = document.querySelector(".window .chat-content .chat");
 
 		if (chat) {
 			chat.focus();