diff --git a/src/ui/Forms/SpellCheck.Designer.cs b/src/ui/Forms/SpellCheck.Designer.cs
index 46691195e..76d8ba907 100644
--- a/src/ui/Forms/SpellCheck.Designer.cs
+++ b/src/ui/Forms/SpellCheck.Designer.cs
@@ -54,6 +54,7 @@
             this.panelBookmark = new System.Windows.Forms.Panel();
             this.labelBookmark = new System.Windows.Forms.Label();
             this.bookmarkToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.bookmarkCommentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.contextMenuStrip1.SuspendLayout();
             this.groupBoxWordNotFound.SuspendLayout();
             this.groupBoxSuggestions.SuspendLayout();
@@ -127,6 +128,7 @@
             this.toolStripSeparator1,
             this.deleteToolStripMenuItem,
             this.bookmarkToolStripMenuItem,
+            this.bookmarkCommentToolStripMenuItem,
             this.openImagedBasedSourceFileToolStripMenuItem});
             this.contextMenuStrip1.Name = "contextMenuStrip1";
             this.contextMenuStrip1.Size = new System.Drawing.Size(247, 142);
@@ -461,6 +463,13 @@
             this.bookmarkToolStripMenuItem.Text = "Bookmark...";
             this.bookmarkToolStripMenuItem.Click += new System.EventHandler(this.bookmarkToolStripMenuItem_Click);
             // 
+            // bookmarkCommentToolStripMenuItem
+            // 
+            this.bookmarkCommentToolStripMenuItem.Name = "bookmarkCommentToolStripMenuItem";
+            this.bookmarkCommentToolStripMenuItem.Size = new System.Drawing.Size(246, 22);
+            this.bookmarkCommentToolStripMenuItem.Text = "Bookmark text...";
+            this.bookmarkCommentToolStripMenuItem.Click += new System.EventHandler(this.bookmarkCommentToolStripMenuItem_Click);
+            // 
             // SpellCheck
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -547,5 +556,6 @@
         private System.Windows.Forms.Panel panelBookmark;
         private System.Windows.Forms.Label labelBookmark;
         private System.Windows.Forms.ToolStripMenuItem bookmarkToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem bookmarkCommentToolStripMenuItem;
     }
 }
\ No newline at end of file
diff --git a/src/ui/Forms/SpellCheck.cs b/src/ui/Forms/SpellCheck.cs
index 1f0b4a5fa..5fa4bc809 100644
--- a/src/ui/Forms/SpellCheck.cs
+++ b/src/ui/Forms/SpellCheck.cs
@@ -129,7 +129,8 @@ namespace Nikse.SubtitleEdit.Forms
             buttonAddToNames.Text = LanguageSettings.Current.SpellCheck.AddToNamesAndIgnoreList;
             buttonGoogleIt.Text = LanguageSettings.Current.Main.VideoControls.GoogleIt;
             deleteToolStripMenuItem.Text = LanguageSettings.Current.General.DeleteCurrentLine;
-            bookmarkToolStripMenuItem.Text = LanguageSettings.Current.Settings.ToggleBookmarksWithComment;
+            bookmarkToolStripMenuItem.Text = LanguageSettings.Current.Settings.ToggleBookmarks;
+            bookmarkCommentToolStripMenuItem.Text = LanguageSettings.Current.Settings.ToggleBookmarksWithComment;
 
             var gs = Configuration.Settings.General;
             var textBoxFont = gs.SubtitleTextBoxFontBold ? new Font(gs.SubtitleFontName, gs.SubtitleTextBoxFontSize, FontStyle.Bold) : new Font(gs.SubtitleFontName, gs.SubtitleTextBoxFontSize);
@@ -417,6 +418,30 @@ namespace Nikse.SubtitleEdit.Forms
                 e.SuppressKeyPress = true;
                 BeginInvoke(new Action(OpenImageBasedSourceFile));
             }
+            else if (e.KeyData == UiUtil.GetKeys(Configuration.Settings.Shortcuts.GeneralToggleBookmarks))
+            {
+                e.SuppressKeyPress = true;
+                bookmarkToolStripMenuItem_Click(null, null);
+            }
+            else if (e.KeyData == UiUtil.GetKeys(Configuration.Settings.Shortcuts.GeneralToggleBookmarksWithText))
+            {
+                e.SuppressKeyPress = true;
+                bookmarkCommentToolStripMenuItem_Click(null, null);
+            }
+            else if (e.KeyData == UiUtil.GetKeys(Configuration.Settings.Shortcuts.GeneralEditBookmarks))
+            {
+                e.SuppressKeyPress = true;
+                var p = _subtitle.GetParagraphOrDefault(_currentIndex);
+                if (p == null)
+                {
+                    return;
+                }
+
+                if (p?.Bookmark != null)
+                {
+                    _mainForm.EditBookmark(_currentIndex, this);
+                }
+            }
         }
 
         private void OpenImageBasedSourceFile()
@@ -754,7 +779,7 @@ namespace Nikse.SubtitleEdit.Forms
                         _currentParagraph = _subtitle.Paragraphs[_currentIndex];
 
                         panelBookmark.Hide();
-                        if (!string.IsNullOrEmpty(_currentParagraph.Bookmark))
+                        if (_currentParagraph.Bookmark != null)
                         {
                             pictureBoxBookmark.Show();
                         }
@@ -1672,7 +1697,7 @@ namespace Nikse.SubtitleEdit.Forms
             return bookmarkContextMenu;
         }
 
-        private void bookmarkToolStripMenuItem_Click(object sender, EventArgs e)
+        private void bookmarkCommentToolStripMenuItem_Click(object sender, EventArgs e)
         {
             var p = _subtitle.GetParagraphOrDefault(_currentIndex);
             if (p == null)
@@ -1681,7 +1706,7 @@ namespace Nikse.SubtitleEdit.Forms
             }
 
             _mainForm.ToggleBookmarks(string.IsNullOrEmpty(p.Bookmark), this);
-            if (p?.Bookmark?.Length > 0)
+            if (p?.Bookmark != null)
             {
                 pictureBoxBookmark.Show();
                 labelBookmark.Text = p.Bookmark;
@@ -1692,5 +1717,24 @@ namespace Nikse.SubtitleEdit.Forms
                 labelBookmark.Hide();
             }
         }
+
+        private void bookmarkToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var p = _subtitle.GetParagraphOrDefault(_currentIndex);
+            if (p == null)
+            {
+                return;
+            }
+
+            _mainForm.ToggleBookmarks(false, this);
+            if (p?.Bookmark != null)
+            {
+                pictureBoxBookmark.Show();
+            }
+            else
+            {
+                pictureBoxBookmark.Hide();
+            }
+        }
     }
 }