diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index 0f8d7189b7..3ba14b32fb 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -834,17 +834,7 @@ export default class RoomView extends React.Component<IProps, IState> {
 
             case Action.FocusAComposer: {
                 // re-dispatch to the correct composer
-                if (this.state.editState) {
-                    dis.dispatch({
-                        ...payload,
-                        action: Action.FocusEditMessageComposer,
-                    });
-                } else {
-                    dis.dispatch({
-                        ...payload,
-                        action: Action.FocusSendMessageComposer,
-                    });
-                }
+                dis.fire(this.state.editState ? Action.FocusEditMessageComposer : Action.FocusSendMessageComposer);
                 break;
             }