2 files changed, 22 insertions, 5 deletions

diff --git a/src/app.c b/src/app.c
index 12d4024d..dd4d4ed2 100644
--- a/src/app.c
+++ b/src/app.c
@@ -1383,9 +1383,18 @@ iBool handleCommand_App(const char *cmd) {
     }
     else if (equal_Command(cmd, "bookmark.add")) {
         iDocumentWidget *doc = document_App();
-        makeBookmarkCreation_Widget(url_DocumentWidget(doc),
-                                    bookmarkTitle_DocumentWidget(doc),
-                                    siteIcon_GmDocument(document_DocumentWidget(doc)));
+        if (suffixPtr_Command(cmd, "url")) {
+            iString *title = collect_String(newRange_String(range_Command(cmd, "title")));
+            replace_String(title, "%20", " ");
+            makeBookmarkCreation_Widget(collect_String(suffix_Command(cmd, "url")),
+                                        title,
+                                        0x1f588 /* pin */);
+        }
+        else {
+            makeBookmarkCreation_Widget(url_DocumentWidget(doc),
+                                        bookmarkTitle_DocumentWidget(doc),
+                                        siteIcon_GmDocument(document_DocumentWidget(doc)));
+        }
         postCommand_App("focus.set id:bmed.title");
         return iTrue;
     }
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 3f3e453a..1830239a 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -2325,10 +2325,18 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                                   format_CStr("!open noproxy:1 url:%s", cstr_String(linkUrl)) } },
                             2);
                     }
+                    iString *linkLabel = collect_String(newRange_String(d->contextLink->text));
+                    urlEncodeSpaces_String(linkLabel);
                     pushBackN_Array(&items,
                                     (iMenuItem[]){ { "---", 0, 0, NULL },
-                                                   { "Copy Link", 0, 0, "document.copylink" } },
-                                    2);
+                                                   { "Copy Link", 0, 0, "document.copylink" },
+                                                   { "Bookmark Link...",
+                                                     0,
+                                                     0,
+                                                     format_CStr("!bookmark.add title:%s url:%s",
+                                                                 cstr_String(linkLabel),
+                                                                 cstr_String(linkUrl)) } },
+                                    3);
                     iMediaRequest *mediaReq;
                     if ((mediaReq = findMediaRequest_DocumentWidget_(d, d->contextLink->linkId)) != NULL) {
                         if (isFinished_GmRequest(mediaReq->req)) {