diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js b/app/assets/javascripts/discourse/controllers/bookmark.js
index f9bf306824b..ec384d54ae9 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js
@@ -1,6 +1,5 @@
 import { and } from "@ember/object/computed";
 import { isPresent } from "@ember/utils";
-import { next } from "@ember/runloop";
 import Controller from "@ember/controller";
 import { Promise } from "rsvp";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
@@ -77,10 +76,6 @@ export default Controller.extend(ModalFunctionality, {
 
     if (this.editingExistingBookmark()) {
       this.initializeExistingBookmarkData();
-    } else {
-      // make sure the input is cleared, otherwise the keyboard shortcut to toggle
-      // bookmark for post ends up in the input
-      next(() => this.set("model.name", null));
     }
   },
 
diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
index 2ce05f463ba..498c920e9d6 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
@@ -174,7 +174,10 @@ export default {
     this.pause(Object.keys(combinations));
   },
 
-  toggleBookmark() {
+  toggleBookmark(event) {
+    event.preventDefault();
+    event.stopPropagation();
+
     this.sendToSelectedPost("toggleBookmark");
     this.sendToTopicListItemView("toggleBookmark");
   },