diff --git a/src/components/views/rooms/MessageComposerButtons.tsx b/src/components/views/rooms/MessageComposerButtons.tsx
index 0a7f611b71c..2d14700d302 100644
--- a/src/components/views/rooms/MessageComposerButtons.tsx
+++ b/src/components/views/rooms/MessageComposerButtons.tsx
@@ -74,21 +74,21 @@ const MessageComposerButtons: React.FC<IProps> = (props: IProps) => {
         ];
         moreButtons = [
             uploadButton(), // props passed via UploadButtonContext
-            showStickersButton(props),
+            stickersButton(props),
             voiceRecordingButton(props, narrow),
             props.showPollsButton && pollButton(room, props.relation),
-            showLocationButton(props, room, roomId, matrixClient),
+            props.showLocationButton && locationButton(props, room, roomId, matrixClient),
         ];
     } else {
         mainButtons = [
             emojiButton(props),
+            stickersButton(props),
+            voiceRecordingButton(props, narrow),
             uploadButton(), // props passed via UploadButtonContext
         ];
         moreButtons = [
-            showStickersButton(props),
-            voiceRecordingButton(props, narrow),
             props.showPollsButton && pollButton(room, props.relation),
-            showLocationButton(props, room, roomId, matrixClient),
+            locationButton(props, room, roomId, matrixClient),
         ];
     }
 
@@ -265,7 +265,7 @@ const UploadButton = () => {
     />;
 };
 
-function showStickersButton(props: IProps): ReactElement {
+function stickersButton(props: IProps): ReactElement {
     return (
         props.showStickersButton
             ? <CollapsibleButton
@@ -357,22 +357,20 @@ class PollButton extends React.PureComponent<IPollButtonProps> {
     }
 }
 
-function showLocationButton(
+function locationButton(
     props: IProps,
     room: Room,
     roomId: string,
     matrixClient: MatrixClient,
 ): ReactElement {
     return (
-        props.showLocationButton
-            ? <LocationButton
-                key="location"
-                roomId={roomId}
-                relation={props.relation}
-                sender={room.getMember(matrixClient.getUserId())}
-                menuPosition={props.menuPosition}
-            />
-            : null
+        <LocationButton
+            key="location"
+            roomId={roomId}
+            relation={props.relation}
+            sender={room.getMember(matrixClient.getUserId())}
+            menuPosition={props.menuPosition}
+        />
     );
 }
 
diff --git a/test/components/views/rooms/MessageComposerButtons-test.tsx b/test/components/views/rooms/MessageComposerButtons-test.tsx
index f0e736c032c..2c31b763604 100644
--- a/test/components/views/rooms/MessageComposerButtons-test.tsx
+++ b/test/components/views/rooms/MessageComposerButtons-test.tsx
@@ -54,6 +54,8 @@ describe("MessageComposerButtons", () => {
 
         expect(buttonLabels(buttons)).toEqual([
             "Emoji",
+            "Sticker",
+            "Voice Message",
             "Attachment",
             "More options",
         ]);
@@ -73,11 +75,11 @@ describe("MessageComposerButtons", () => {
 
         expect(buttonLabels(buttons)).toEqual([
             "Emoji",
+            "Sticker",
+            "Voice Message",
             "Attachment",
             "More options",
             [
-                "Sticker",
-                "Voice Message",
                 "Poll",
                 "Location",
             ],