diff --git a/client/js/keybinds.js b/client/js/keybinds.js
index 4b40e9c1..bb27af31 100644
--- a/client/js/keybinds.js
+++ b/client/js/keybinds.js
@@ -247,11 +247,10 @@ const ignoredKeys = {
 	224: true, // Meta
 };
 
-$(document.body).on("keydown", (e) => {
-	// Ignore if target isn't body (e.g. focused into input)
+$(document).on("keydown", (e) => {
 	// Ignore any key that uses alt modifier
 	// Ignore keys defined above
-	if (e.target !== document.body || e.altKey || ignoredKeys[e.which]) {
+	if (e.altKey || ignoredKeys[e.which]) {
 		return;
 	}
 
@@ -260,6 +259,13 @@ $(document.body).on("keydown", (e) => {
 		return;
 	}
 
+	const tagName = e.target.tagName;
+
+	// Ignore if we're already typing into <input> or <textarea>
+	if (tagName === "INPUT" || tagName === "TEXTAREA") {
+		return;
+	}
+
 	// On enter, focus the input but do not propagate the event
 	// This way, a new line is not inserted
 	if (e.which === 13) {