diff --git a/packages/rocketchat-ui-master/master/main.coffee b/packages/rocketchat-ui-master/master/main.coffee
index d4c7bb085e9..7450a589ca6 100644
--- a/packages/rocketchat-ui-master/master/main.coffee
+++ b/packages/rocketchat-ui-master/master/main.coffee
@@ -29,6 +29,15 @@ Template.body.onRendered ->
 					if subscription.alert or subscription.unread > 0
 						Meteor.call 'readMessages', subscription.rid
 
+	$(document.body).on 'keydown', (e) ->
+		target = e.target
+		if /input|textarea|select/i.test(target.tagName)
+			return
+		$inputMessage = $('textarea.input-message')
+		if 0 == $inputMessage.length
+			return
+		$inputMessage.focus()
+
 	$(document.body).on 'click', 'a', (e) ->
 		link = e.currentTarget
 		if link.origin is s.rtrim(Meteor.absoluteUrl(), '/') and /msg=([a-zA-Z0-9]+)/.test(link.search)
diff --git a/packages/rocketchat-ui/lib/fireEvent.js b/packages/rocketchat-ui/lib/fireEvent.js
index 5fee7220898..919a50ca590 100644
--- a/packages/rocketchat-ui/lib/fireEvent.js
+++ b/packages/rocketchat-ui/lib/fireEvent.js
@@ -33,15 +33,3 @@ window.addEventListener('message', (e) => {
 			break;
 	}
 });
-
-window.addEventListener('keydown', (e) => {
-	const target = e.target;
-	if (/input|textarea/i.test(target.tagName)) {
-		return;
-	}
-	const $inputMessage = $('textarea.input-message');
-	if (0 === $inputMessage.length) {
-		return;
-	}
-	$inputMessage.focus();
-});