diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 6638431410..4b05d746f3 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -247,7 +247,6 @@ module.exports = React.createClass({
         UDEHandler.startListening();
 
         this.focusComposer = false;
-        window.addEventListener("focus", this.onFocus);
 
         // this can technically be done anywhere but doing this here keeps all
         // the routing url path logic together.
@@ -910,12 +909,6 @@ module.exports = React.createClass({
         });
     },
 
-    onFocus: function(ev) {
-        if (document.activeElement.textLength === undefined) {
-            dis.dispatch({action: 'focus_composer'});
-        }
-    },
-
     showScreen: function(screen, params) {
         if (screen == 'register') {
             dis.dispatch({