diff --git a/frontend_tests/node_tests/components.js b/frontend_tests/node_tests/components.js
index 84cea84c6c..d5e82d88a7 100644
--- a/frontend_tests/node_tests/components.js
+++ b/frontend_tests/node_tests/components.js
@@ -108,7 +108,7 @@ run_test('basics', () => {
             return switcher;
         case "<div class='ind-tab' data-tab-key='keyboard-shortcuts' data-tab-id='0' tabindex='0'>translated: Keyboard shortcuts</div>":
             return make_tab(0);
-        case "<div class='ind-tab' data-tab-key='markdown-help' data-tab-id='1' tabindex='0'>translated: Message formatting</div>":
+        case "<div class='ind-tab' data-tab-key='message-formatting' data-tab-id='1' tabindex='0'>translated: Message formatting</div>":
             return make_tab(1);
         case "<div class='ind-tab' data-tab-key='search-operators' data-tab-id='2' tabindex='0'>translated: Search operators</div>":
             return make_tab(2);
@@ -124,7 +124,7 @@ run_test('basics', () => {
         selected: 0,
         values: [
             { label: i18n.t("Keyboard shortcuts"), key: "keyboard-shortcuts" },
-            { label: i18n.t("Message formatting"), key: "markdown-help" },
+            { label: i18n.t("Message formatting"), key: "message-formatting" },
             { label: i18n.t("Search operators"), key: "search-operators" },
         ],
         callback: function (name, key) {
@@ -152,18 +152,18 @@ run_test('basics', () => {
 
     callback_args = undefined;
 
-    widget.goto('markdown-help');
+    widget.goto('message-formatting');
     assert.equal(focused_tab, 1);
     assert.equal(tabs[0].class, 'first');
     assert.equal(tabs[1].class, 'middle selected');
     assert.equal(tabs[2].class, 'last');
-    assert.deepEqual(callback_args, ['translated: Message formatting', 'markdown-help']);
+    assert.deepEqual(callback_args, ['translated: Message formatting', 'message-formatting']);
     assert.equal(widget.value(), 'translated: Message formatting');
 
     // Go to same tab twice and make sure we get callback.
     callback_args = undefined;
-    widget.goto('markdown-help');
-    assert.deepEqual(callback_args, ['translated: Message formatting', 'markdown-help']);
+    widget.goto('message-formatting');
+    assert.deepEqual(callback_args, ['translated: Message formatting', 'message-formatting']);
 
     callback_args = undefined;
     keydown_f.call(tabs[focused_tab], RIGHT_KEY);
diff --git a/frontend_tests/node_tests/hashchange.js b/frontend_tests/node_tests/hashchange.js
index a81f203d92..7d9f300e77 100644
--- a/frontend_tests/node_tests/hashchange.js
+++ b/frontend_tests/node_tests/hashchange.js
@@ -244,14 +244,14 @@ run_test('hash_interactions', () => {
         'info: keyboard-shortcuts',
     ]);
 
-    window.location.hash = '#markdown-help/whatever';
+    window.location.hash = '#message-formatting/whatever';
 
     helper.clear_events();
     window.onhashchange();
     helper.assert_events([
         'overlays.close_for_hash_change',
         'trigger event',
-        'info: markdown-help',
+        'info: message-formatting',
     ]);
 
     window.location.hash = '#search-operators/whatever';
diff --git a/static/js/hashchange.js b/static/js/hashchange.js
index b21c19a316..9ea8ff7780 100644
--- a/static/js/hashchange.js
+++ b/static/js/hashchange.js
@@ -138,8 +138,8 @@ function do_hashchange(from_reload) {
     case "#keyboard-shortcuts":
         info_overlay.show("keyboard-shortcuts");
         break;
-    case "#markdown-help":
-        info_overlay.show("markdown-help");
+    case "#message-formatting":
+        info_overlay.show("message-formatting");
         break;
     case "#search-operators":
         info_overlay.show("search-operators");
diff --git a/static/js/info_overlay.js b/static/js/info_overlay.js
index 0330b92391..0e5a35dfbb 100644
--- a/static/js/info_overlay.js
+++ b/static/js/info_overlay.js
@@ -31,7 +31,7 @@ exports.set_up_toggler = function () {
         child_wants_focus: true,
         values: [
             { label: i18n.t("Keyboard shortcuts"), key: "keyboard-shortcuts" },
-            { label: i18n.t("Message formatting"), key: "markdown-help" },
+            { label: i18n.t("Message formatting"), key: "message-formatting" },
             { label: i18n.t("Search operators"), key: "search-operators" },
         ],
         callback: function (name, key) {
@@ -46,7 +46,7 @@ exports.set_up_toggler = function () {
     elem.addClass('large');
 
     var modals = _.map(opts.values, function (item) {
-        var key = item.key; // e.g. markdown-help
+        var key = item.key; // e.g. message-formatting
         var modal = $('#' + key).find('.modal-body');
         return modal;
     });
diff --git a/static/templates/message_edit_form.handlebars b/static/templates/message_edit_form.handlebars
index ba5828f7ac..f8c458c902 100644
--- a/static/templates/message_edit_form.handlebars
+++ b/static/templates/message_edit_form.handlebars
@@ -40,7 +40,7 @@
                 <span class="message_edit_countdown_timer"></span>
                 <div class="message-edit-timer-control-group">
                     <input type="file" id="message_edit_file_input_{{message_id}}" class="notvisible pull-left" multiple />
-                    <a class="message-control-button fa fa-font" aria-hidden="true" title="{{t 'Formatting' }}" data-overlay-trigger="markdown-help" ></a>
+                    <a class="message-control-button fa fa-font" aria-hidden="true" title="{{t 'Formatting' }}" data-overlay-trigger="message-formatting" ></a>
                     <a class="message-control-button fa fa-paperclip notdisplayed" aria-hidden="true" id="attach_files_{{message_id}}" href="#" title="{{t "Attach files" }}"></a>
                 </div>
                 <span><i id="message_edit_tooltip" class="message_edit_tooltip fa fa-question-circle" aria-hidden="true" data-toggle="tooltip"
diff --git a/templates/zerver/app/compose.html b/templates/zerver/app/compose.html
index bed77849f5..eac4071a20 100644
--- a/templates/zerver/app/compose.html
+++ b/templates/zerver/app/compose.html
@@ -89,7 +89,7 @@
                                 <div id="below-compose-content">
                                     <input type="file" id="file_input" class="notvisible pull-left" multiple />
                                     <a class="message-control-button fa fa-smile-o" aria-hidden="true" id="emoji_map" href="#" title="{{ _('Add emoji') }}"></a>
-                                    <a class="message-control-button fa fa-font" aria-hidden="true" title="{{ _('Formatting') }}" data-overlay-trigger="markdown-help"></a>
+                                    <a class="message-control-button fa fa-font" aria-hidden="true" title="{{ _('Formatting') }}" data-overlay-trigger="message-formatting"></a>
                                     <a class="message-control-button fa fa-paperclip notdisplayed" aria-hidden="true" id="attach_files" href="#" title="{{ _('Attach files') }}"></a> {% if jitsi_server_url %}
                                     <a class="message-control-button fa fa-video-camera" aria-hidden="true" id="video_link" href="#" title="{{ _('Add video call') }}"></a> {% endif %}
                                     <a id="undo_markdown_preview" class="message-control-button fa fa-edit" aria-hidden="true" style="display:none;" title="{{ _('Write') }}"></a>
diff --git a/templates/zerver/app/markdown_help.html b/templates/zerver/app/markdown_help.html
index 08003db654..8bf7d074ab 100644
--- a/templates/zerver/app/markdown_help.html
+++ b/templates/zerver/app/markdown_help.html
@@ -1,4 +1,4 @@
-<div class="overlay-modal hide" id="markdown-help" tabindex="-1" role="dialog"
+<div class="overlay-modal hide" id="message-formatting" tabindex="-1" role="dialog"
     aria-label="{{ _('Message formatting') }}">
     <div class="modal-body" tabindex="0">
         <div id="markdown-instructions">
diff --git a/templates/zerver/app/navbar.html b/templates/zerver/app/navbar.html
index fdad8b45d6..720ddc61ba 100644
--- a/templates/zerver/app/navbar.html
+++ b/templates/zerver/app/navbar.html
@@ -122,7 +122,7 @@
                                 </a>
                             </li>
                             <li role="presentation">
-                                <a tabindex="0" role="menuitem" data-overlay-trigger="markdown-help">
+                                <a tabindex="0" role="menuitem" data-overlay-trigger="message-formatting">
                                     <i class="fa fa-pencil" aria-hidden="true"></i> {{ _('Message formatting') }}
                                 </a>
                             </li>