3 files changed, 10 insertions, 6 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 2e51f253..90c270fc 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -545,7 +545,7 @@ void setUrlFromCache_DocumentWidget(iDocumentWidget *d, const iString *url, iBoo
     }
 }
 
-iDocumentWidget *duplicate_DocumentWidget(iDocumentWidget *orig) {
+iDocumentWidget *duplicate_DocumentWidget(const iDocumentWidget *orig) {
     iDocumentWidget *d = new_DocumentWidget();
     delete_History(d->history);
     d->textSizePercent = orig->textSizePercent;
@@ -1060,7 +1060,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
             return iTrue;
         }
     }
-    processContextMenuEvent_Widget(d->menu, ev);
+    processContextMenuEvent_Widget(d->menu, ev, d->hoverLink = NULL);
     switch (processEvent_Click(&d->click, ev)) {
         case started_ClickResult:
             d->selecting = iFalse;
@@ -1084,6 +1084,9 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
             return iTrue;
         }
         case finished_ClickResult:
+            if (isVisible_Widget(d->menu)) {
+                closeMenu_Widget(d->menu);
+            }
             if (!isMoved_Click(&d->click)) {
                 if (d->hoverLink) {
                     const iGmLinkId linkId = d->hoverLink->linkId;
@@ -1115,7 +1118,8 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                         refresh_Widget(w);
                     }
                     else {
-                        postCommandf_App("open url:%s",
+                        postCommandf_App("open newtab:%d url:%s",
+                                         (SDL_GetModState() & KMOD_PRIMARY) != 0,
                                          cstr_String(absoluteUrl_String(
                                              d->url, linkUrl_GmDocument(d->doc, linkId))));
                     }
diff --git a/src/ui/documentwidget.h b/src/ui/documentwidget.h
index 5e7c3f2c..85b9a710 100644
--- a/src/ui/documentwidget.h
+++ b/src/ui/documentwidget.h
@@ -7,7 +7,7 @@ iDeclareType(History)
 iDeclareWidgetClass(DocumentWidget)
 iDeclareObjectConstruction(DocumentWidget)
 
-iDocumentWidget *duplicate_DocumentWidget       (iDocumentWidget *);
+iDocumentWidget *duplicate_DocumentWidget       (const iDocumentWidget *);
 iHistory *      history_DocumentWidget          (iDocumentWidget *);
 
 const iString * url_DocumentWidget              (const iDocumentWidget *);
diff --git a/src/ui/util.h b/src/ui/util.h
index 26066e53..b67f0a87 100644
--- a/src/ui/util.h
+++ b/src/ui/util.h
@@ -84,9 +84,9 @@ void        closeMenu_Widget    (iWidget *);
 
 int         checkContextMenu_Widget   (iWidget *, const SDL_Event *ev); /* see macro below */
 
-#define processContextMenuEvent_Widget(menu, sdlEvent) \
+#define processContextMenuEvent_Widget(menu, sdlEvent, stmtEaten) \
     for (const int result = checkContextMenu_Widget((menu), (sdlEvent));;) { \
-        if (result) return result >> 1; \
+        if (result) { {stmtEaten;} return result >> 1; } \
         break; \
     }