2 files changed, 17 insertions, 7 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 75309737..43850043 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -244,6 +244,8 @@ void init_DocumentWidget(iDocumentWidget *d) {
 #if !defined (iPlatformApple) /* in system menu */
     addAction_Widget(w, reload_KeyShortcut, "navigate.reload");
     addAction_Widget(w, SDLK_w, KMOD_PRIMARY, "tabs.close");
+    addAction_Widget(w, SDLK_d, KMOD_PRIMARY, "bookmark.add");
+    addAction_Widget(w, subscribeToPage_KeyModifier, "feeds.subscribe");
 #endif
     addAction_Widget(w, navigateBack_KeyShortcut, "navigate.back");
     addAction_Widget(w, navigateForward_KeyShortcut, "navigate.forward");
@@ -2308,8 +2310,11 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                             { "---", 0, 0, NULL },
                             { "Reload Page", reload_KeyShortcut, "navigate.reload" },
                             { "---", 0, 0, NULL },
+                            { "Bookmark Page...", SDLK_d, KMOD_PRIMARY, "bookmark.add" },
+                            { "Subscribe to Page...", subscribeToPage_KeyModifier, "feeds.subscribe" },
+                            { "---", 0, 0, NULL },
                             { "Copy Page URL", 0, 0, "document.copylink" } },
-                        8);
+                        11);
                     if (isEmpty_Range(&d->selectMark)) {
                         pushBackN_Array(
                             &items,
diff --git a/src/ui/window.c b/src/ui/window.c
index c2d43aae..a16976b5 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -104,17 +104,18 @@ static const iMenuItem navMenuItems_[] = {
     { "Save to Downloads", SDLK_s, KMOD_PRIMARY, "document.save" },
     { "Copy Source Text", SDLK_c, KMOD_PRIMARY, "copy" },
     { "---", 0, 0, NULL },
-    { "Bookmark Page", SDLK_d, KMOD_PRIMARY, "bookmark.add" },
-    { "Subscribe to Page", subscribeToPage_KeyModifier, "feeds.subscribe" },
-    { "---", 0, 0, NULL },
-    { "Show Feed Entries", 0, 0, "!open url:about:feeds" },
-    { "---", 0, 0, NULL },
     { "Toggle Left Sidebar", SDLK_l, KMOD_PRIMARY | KMOD_SHIFT, "sidebar.toggle" },
     { "Toggle Right Sidebar", SDLK_p, KMOD_PRIMARY | KMOD_SHIFT, "sidebar2.toggle" },
     { "Zoom In", SDLK_EQUALS, KMOD_PRIMARY, "zoom.delta arg:10" },
     { "Zoom Out", SDLK_MINUS, KMOD_PRIMARY, "zoom.delta arg:-10" },
     { "Reset Zoom", SDLK_0, KMOD_PRIMARY, "zoom.set arg:100" },
     { "---", 0, 0, NULL },
+    { "List All Bookmarks", 0, 0, "!open url:about:bookmarks" },
+    { "List Bookmarks by Tag", 0, 0, "!open url:about:bookmarks?tags" },
+    { "List Bookmarks by Creation Time", 0, 0, "!open url:about:bookmarks?created" },
+    { "---", 0, 0, NULL },
+    { "Show Feed Entries", 0, 0, "!open url:about:feeds" },
+    { "---", 0, 0, NULL },
     { "Preferences...", SDLK_COMMA, KMOD_PRIMARY, "preferences" },
     { "Help", SDLK_F1, 0, "!open url:about:help" },
     { "Release Notes", 0, 0, "!open url:about:version" },
@@ -162,7 +163,11 @@ static const iMenuItem viewMenuItems_[] = {
 static iMenuItem bookmarksMenuItems_[] = {
     { "Bookmark This Page...", SDLK_d, KMOD_PRIMARY, "bookmark.add" },
     { "---", 0, 0, NULL },
-    { "Subscribe to This Page", subscribeToPage_KeyModifier, "feeds.subscribe" },
+    { "List All", 0, 0, "open url:about:bookmarks" },
+    { "List by Tag", 0, 0, "open url:about:bookmarks?tags" },
+    { "List by Creation Time", 0, 0, "open url:about:bookmarks?created" },
+    { "---", 0, 0, NULL },
+    { "Subscribe to This Page...", subscribeToPage_KeyModifier, "feeds.subscribe" },
     { "---", 0, 0, NULL },
     { "Show Feed Entries", 0, 0, "open url:about:feeds" },
     { "Refresh Feeds", SDLK_r, KMOD_PRIMARY | KMOD_SHIFT, "feeds.refresh" },