diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 7eef868ef7e..651974a4085 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -501,7 +501,7 @@ export default class MessageComposer extends React.Component {
                         { formatButtons }
                         <div style={{ flex: 1 }}></div>
                         <AccessibleButton className="mx_MessageComposer_formatbar_markdown mx_MessageComposer_markdownDisabled"
-                            onMouseDown={this.onToggleMarkdownClicked}
+                            onClick={this.onToggleMarkdownClicked}
                             title={_t("Markdown is disabled")}
                         />
                         <AccessibleButton element="img" title={_t("Hide Text Formatting Toolbar")}
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 1954ca0d849..1514b58e27f 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -1603,7 +1603,7 @@ export default class MessageComposerInput extends React.Component {
                 </div>
                 <div className={className}>
                     <AccessibleButton className={markdownClasses}
-                        onMouseDown={this.onMarkdownToggleClicked}
+                        onClick={this.onMarkdownToggleClicked}
                         title={this.state.isRichTextEnabled ? _t("Markdown is disabled") : _t("Markdown is enabled")}
                     />
                     <Editor ref={this._collectEditor}