diff --git a/src/components/views/rooms/MessageComposerButtons.tsx b/src/components/views/rooms/MessageComposerButtons.tsx
index 8411f442d59a..2d14700d302c 100644
--- a/src/components/views/rooms/MessageComposerButtons.tsx
+++ b/src/components/views/rooms/MessageComposerButtons.tsx
@@ -82,11 +82,11 @@ const MessageComposerButtons: React.FC<IProps> = (props: IProps) => {
     } else {
         mainButtons = [
             emojiButton(props),
+            stickersButton(props),
+            voiceRecordingButton(props, narrow),
             uploadButton(), // props passed via UploadButtonContext
         ];
         moreButtons = [
-            stickersButton(props),
-            voiceRecordingButton(props, narrow),
             props.showPollsButton && pollButton(room, props.relation),
             locationButton(props, room, roomId, matrixClient),
         ];
diff --git a/test/components/views/rooms/MessageComposerButtons-test.tsx b/test/components/views/rooms/MessageComposerButtons-test.tsx
index f0e736c032cb..2c31b763604e 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",
             ],