diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index a18dded04f..1e43aa6652 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -263,7 +263,7 @@ export default class MessageComposer extends React.Component {
             tombstone: this._getRoomTombstone(),
             canSendMessages: this.props.room.maySendMessage(),
             showCallButtons: SettingsStore.getValue("showCallButtonsInComposer"),
-            showSendButton: SettingsStore.getValue("MessageComposerInput.sendButton"),
+            showSendButton: SettingsStore.getValue("MessageComposerInput.showSendButton"),
             hasConference: WidgetStore.instance.doesRoomHaveConference(this.props.room),
             joinedConference: WidgetStore.instance.isJoinedToConferenceIn(this.props.room),
         };
@@ -283,7 +283,7 @@ export default class MessageComposer extends React.Component {
 
     onSendButtonChanged = () => {
         this.setState({
-            showSendButton: SettingsStore.getValue("MessageComposerInput.sendButton"),
+            showSendButton: SettingsStore.getValue("MessageComposerInput.showSendButton"),
         });
     }
 
@@ -300,7 +300,7 @@ export default class MessageComposer extends React.Component {
         MatrixClientPeg.get().on("RoomState.events", this._onRoomStateEvents);
         this._waitForOwnMember();
         this.showSendButtonRef = SettingsStore.watchSetting(
-            "MessageComposerInput.sendButton", null, this.onSendButtonChanged);
+            "MessageComposerInput.showSendButton", null, this.onSendButtonChanged);
     }
 
     _waitForOwnMember() {
diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
index 31971b7167..eff0824d59 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
@@ -34,7 +34,7 @@ export default class PreferencesUserSettingsTab extends React.Component {
         'MessageComposerInput.suggestEmoji',
         'sendTypingNotifications',
         'MessageComposerInput.ctrlEnterToSend',
-        `MessageComposerInput.sendButton`,
+        `MessageComposerInput.showSendButton`,
     ];
 
     static TIMELINE_SETTINGS = [
diff --git a/src/settings/Settings.ts b/src/settings/Settings.ts
index 50d0f919e6..2d8385240c 100644
--- a/src/settings/Settings.ts
+++ b/src/settings/Settings.ts
@@ -336,7 +336,7 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         displayName: isMac ? _td("Use Command + Enter to send a message") : _td("Use Ctrl + Enter to send a message"),
         default: false,
     },
-    "MessageComposerInput.sendButton": {
+    "MessageComposerInput.showSendButton": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td("Show send message button"),
         default: false,