1 files changed, 7 insertions, 6 deletions
diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts.js b/app/assets/javascripts/behaviors/shortcuts/shortcuts.js
index 5c6e4665a5c..efb462f4778 100644
--- a/app/assets/javascripts/behaviors/shortcuts/shortcuts.js
+++ b/app/assets/javascripts/behaviors/shortcuts/shortcuts.js
@@ -186,13 +186,14 @@ export default class Shortcuts {
   }
 
   static toggleMarkdownPreview(e) {
-    // Check if short-cut was triggered while in Write Mode
-    const $target = $(e.target);
-    const $form = $target.closest('form');
+    const $form = $(e.target).closest('form');
+    const toggle = $('.js-md-preview-button', $form).get(0);
+
+    if (!toggle) return;
+
+    toggle.focus();
+    toggle.click();
 
-    if ($target.hasClass('js-note-text')) {
-      $('.js-md-preview-button', $form).focus();
-    }
     $(document).triggerHandler('markdown-preview:toggle', [e]);
   }