diff --git a/src/ContentMessages.js b/src/ContentMessages.js
index 2d58622db8..9317e0b746 100644
--- a/src/ContentMessages.js
+++ b/src/ContentMessages.js
@@ -498,9 +498,6 @@ export default class ContentMessages {
         this.inprogress.push(upload);
         dis.dispatch({action: 'upload_started'});
 
-        // Focus the composer view
-        dis.dispatch({action: 'focus_composer'});
-
         let error;
 
         function onProgress(ev) {
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index db5b7d034b..ad3c9ba3fa 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -268,8 +268,6 @@ export default React.createClass({
     componentDidMount: function() {
         this.dispatcherRef = dis.register(this.onAction);
 
-        this.focusComposer = false;
-
         // this can technically be done anywhere but doing this here keeps all
         // the routing url path logic together.
         if (this.onAliasClick) {
@@ -362,10 +360,6 @@ export default React.createClass({
             const durationMs = this.stopPageChangeTimer();
             Analytics.trackPageChange(durationMs);
         }
-        if (this.focusComposer) {
-            dis.dispatch({action: 'focus_composer'});
-            this.focusComposer = false;
-        }
     },
 
     startPageChangeTimer() {
@@ -793,8 +787,6 @@ export default React.createClass({
     //                               that has been passed out-of-band (eg.
     //                               room name and avatar from an invite email)
     _viewRoom: function(roomInfo) {
-        this.focusComposer = true;
-
         const newState = {
             view: VIEWS.LOGGED_IN,
             currentRoomId: roomInfo.room_id || null,
@@ -1368,7 +1360,6 @@ export default React.createClass({
             self.firstSyncComplete = true;
             self.firstSyncPromise.resolve();
 
-            dis.dispatch({action: 'focus_composer'});
             self.setState({
                 ready: true,
                 showNotifierToolbar: Notifier.shouldShowToolbar(),
diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index 7ef080e235..bf756b291b 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -135,12 +135,10 @@ module.exports = React.createClass({
 
     _onResendAllClick: function() {
         Resend.resendUnsentEvents(this.props.room);
-        dis.dispatch({action: 'focus_composer'});
     },
 
     _onCancelAllClick: function() {
         Resend.cancelUnsentEvents(this.props.room);
-        dis.dispatch({action: 'focus_composer'});
     },
 
     _onShowDevicesClick: function() {
diff --git a/src/components/views/elements/MessageEditor.js b/src/components/views/elements/MessageEditor.js
index f51348ce04..86e79a3410 100644
--- a/src/components/views/elements/MessageEditor.js
+++ b/src/components/views/elements/MessageEditor.js
@@ -222,7 +222,6 @@ export default class MessageEditor extends React.Component {
                 dis.dispatch({action: 'edit_event', event: nextEvent});
             } else {
                 dis.dispatch({action: 'edit_event', event: null});
-                dis.dispatch({action: 'focus_composer'});
             }
             event.preventDefault();
         }
@@ -230,7 +229,6 @@ export default class MessageEditor extends React.Component {
 
     _cancelEdit = () => {
         dis.dispatch({action: "edit_event", event: null});
-        dis.dispatch({action: 'focus_composer'});
     }
 
     _hasModifications(newContent) {
@@ -257,7 +255,6 @@ export default class MessageEditor extends React.Component {
         this.context.matrixClient.sendMessage(roomId, editContent);
 
         dis.dispatch({action: "edit_event", event: null});
-        dis.dispatch({action: 'focus_composer'});
     }
 
     _cancelPreviousPendingEdit() {
diff --git a/src/cryptodevices.js b/src/cryptodevices.js
index 246fae3d73..b9a1fe869e 100644
--- a/src/cryptodevices.js
+++ b/src/cryptodevices.js
@@ -65,10 +65,6 @@ export async function getUnknownDevicesForRoom(matrixClient, room) {
     return unknownDevices;
 }
 
-function focusComposer() {
-    dis.dispatch({action: 'focus_composer'});
-}
-
 /**
  * Show the UnknownDeviceDialog for a given room. The dialog will inform the user
  * that messages they sent to this room have not been sent due to unknown devices
@@ -90,7 +86,6 @@ export function showUnknownDeviceDialogForMessages(matrixClient, room) {
             sendAnywayLabel: _t("Send anyway"),
             sendLabel: _t("Send"),
             onSend: onSendClicked,
-            onFinished: focusComposer,
         }, 'mx_Dialog_unknownDevice');
     });
 }