diff --git a/frontend_tests/puppeteer_tests/drafts.ts b/frontend_tests/puppeteer_tests/drafts.ts
index fec9e601cf..24a6f2cd08 100644
--- a/frontend_tests/puppeteer_tests/drafts.ts
+++ b/frontend_tests/puppeteer_tests/drafts.ts
@@ -22,7 +22,6 @@ async function get_drafts_count(page: Page): Promise<number> {
 
 const drafts_button = ".top_left_drafts";
 const drafts_overlay = "#draft_overlay";
-const drafts_button_in_compose = "#below-compose-content .drafts-link";
 
 async function test_empty_drafts(page: Page): Promise<void> {
     await page.waitForSelector(drafts_button, {visible: true});
@@ -68,10 +67,10 @@ async function open_compose_markdown_preview(page: Page): Promise<void> {
     await page.click(markdown_preview_button);
 }
 
-async function open_drafts_through_compose(page: Page): Promise<void> {
+async function open_drafts_after_markdown_preview(page: Page): Promise<void> {
     await open_compose_markdown_preview(page);
-    await page.waitForSelector(drafts_button_in_compose, {visible: true});
-    await page.click(drafts_button_in_compose);
+    await page.waitForSelector(drafts_button, {visible: true});
+    await page.click(drafts_button);
     await wait_for_drafts_to_appear(page);
 }
 
@@ -250,7 +249,7 @@ async function drafts_test(page: Page): Promise<void> {
 
     await create_stream_message_draft(page);
     await create_private_message_draft(page);
-    await open_drafts_through_compose(page);
+    await open_drafts_after_markdown_preview(page);
     await test_previously_created_drafts_rendered(page);
 
     await test_restore_message_draft(page);
diff --git a/static/js/message_edit.js b/static/js/message_edit.js
index ca86387580..1c50453c0b 100644
--- a/static/js/message_edit.js
+++ b/static/js/message_edit.js
@@ -405,7 +405,6 @@ function edit_message(row, raw_content) {
             notify_new_thread: notify_new_thread_default,
             notify_old_thread: notify_old_thread_default,
             giphy_enabled: giphy.is_giphy_enabled(),
-            hide_drafts_link: true,
         }),
     );
 
diff --git a/static/templates/compose_control_buttons.hbs b/static/templates/compose_control_buttons.hbs
index 2a7125e90f..9ce4164269 100644
--- a/static/templates/compose_control_buttons.hbs
+++ b/static/templates/compose_control_buttons.hbs
@@ -10,7 +10,4 @@
 <a role="button" class="compose_control_button compose_giphy_link {{#unless giphy_enabled }} hide {{/unless}}" aria-label="{{t 'Add GIF' }}" data-tippy-content="{{t 'Add GIF' }}">
     <i class="compose_gif_icon zulip-icon zulip-icon-gif" tabindex=0></i>
 </a>
-{{#unless hide_drafts_link}}
-<a class="message-control-link drafts-link" href="#drafts" title="{{t 'Drafts' }} (d)">{{t 'Drafts' }}</a>
-{{/unless}}
 <a role="button" class="message-control-link" tabindex=0 data-overlay-trigger="message-formatting">{{t 'Help' }}</a>