diff --git a/res/css/views/rooms/_MessageComposer.scss b/res/css/views/rooms/_MessageComposer.scss
index 454d604572..27d28eb4e6 100644
--- a/res/css/views/rooms/_MessageComposer.scss
+++ b/res/css/views/rooms/_MessageComposer.scss
@@ -405,4 +405,12 @@ limitations under the License.
 .mx_MessageComposer_Menu .mx_CallContextMenu_item {
     display: flex;
     align-items: center;
+    max-width: unset;
+    width: 100%;
+}
+
+.mx_MessageComposer_Menu .mx_ContextualMenu {
+    min-width: 150px;
+    width: max-content;
+    padding: 5px 10px 5px 0;
 }
diff --git a/src/components/views/rooms/MessageComposer.tsx b/src/components/views/rooms/MessageComposer.tsx
index 397d3da84a..5dad26875e 100644
--- a/src/components/views/rooms/MessageComposer.tsx
+++ b/src/components/views/rooms/MessageComposer.tsx
@@ -605,10 +605,6 @@ export default class MessageComposer extends React.Component<IProps, IState> {
                 <ContextMenu
                     onFinished={this.toggleButtonMenu}
                     {...menuPosition}
-                    menuPaddingRight={10}
-                    menuPaddingTop={5}
-                    menuPaddingBottom={5}
-                    menuWidth={150}
                     wrapperClassName="mx_MessageComposer_Menu"
                 >
                     { buttons.map((button, index) => (