3 files changed, 15 insertions, 11 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5922eabe..557c829d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ pkg_check_modules (SDL2 REQUIRED sdl2)
 # Embedded resources are written to a generated source file.
 message (STATUS "Preparing embedded resources...")
 # Fonts are too large to comfortably embed as a C source.
-set (EMBED_RESOURCES 
+set (EMBED_RESOURCES
     res/about/help.gmi
     res/about/lagrange.gmi
     res/about/version.gmi
@@ -183,8 +183,8 @@ if (MSYS)
     if (NOT ENABLE_RESOURCE_EMBED)
         install (FILES ${EMB_BIN} DESTINATION .)
     endif ()
-    install (PROGRAMS 
-        ${SDL2_LIBDIR}/SDL2.dll 
+    install (PROGRAMS
+        ${SDL2_LIBDIR}/SDL2.dll
         $<TARGET_FILE:the_Foundation::the_Foundation>
         DESTINATION .
     )
diff --git a/src/app.c b/src/app.c
index 44ec18e6..0144c6d7 100644
--- a/src/app.c
+++ b/src/app.c
@@ -339,7 +339,7 @@ static void deinit_App(iApp *d) {
     deinit_SortedArray(&d->tickers);
     delete_Window(d->window);
     d->window = NULL;
-    deinit_CommandLine(&d->args);    
+    deinit_CommandLine(&d->args);
 }
 
 const iString *execPath_App(void) {
@@ -565,7 +565,7 @@ static iBool handlePrefsCommands_(iWidget *d, const char *cmd) {
     else if (equal_Command(cmd, "prefs.ostheme.changed")) {
         postCommandf_App("ostheme arg:%d", arg_Command(cmd));
     }
-    else if (equal_Command(cmd, "theme.changed")) {        
+    else if (equal_Command(cmd, "theme.changed")) {
         updatePrefsThemeButtons_(d);
         if (!argLabel_Command(cmd, "auto")) {
             setToggle_Widget(findChild_Widget(d, "prefs.ostheme"), iFalse);
@@ -617,7 +617,7 @@ iDocumentWidget *newTab_App(const iDocumentWidget *duplicateOf) {
 
 static iBool handleIdentityCreationCommands_(iWidget *dlg, const char *cmd) {
     iApp *d = &app_;
-    if (equal_Command(cmd, "ident.accept") || equal_Command(cmd, "cancel")) {        
+    if (equal_Command(cmd, "ident.accept") || equal_Command(cmd, "cancel")) {
         if (equal_Command(cmd, "ident.accept")) {
             const iString *commonName   = text_InputWidget (findChild_Widget(dlg, "ident.common"));
             const iString *email        = text_InputWidget (findChild_Widget(dlg, "ident.email"));
@@ -733,7 +733,7 @@ iBool handleCommand_App(const char *cmd) {
         newTab_App(isDuplicate ? document_App() : NULL);
         if (!isDuplicate) {
             postCommand_App("navigate.home");
-        }        
+        }
         return iTrue;
     }
     else if (equal_Command(cmd, "tabs.close")) {
@@ -824,6 +824,7 @@ iBool handleCommand_App(const char *cmd) {
         makeBookmarkCreation_Widget(url_DocumentWidget(doc),
                                     bookmarkTitle_DocumentWidget(doc),
                                     siteIcon_GmDocument(document_DocumentWidget(doc)));
+        postCommand_App("focus.set id:bmed.title");
         return iTrue;
     }
     else if (equal_Command(cmd, "ident.new")) {
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 3b02f85c..6dc1e9f2 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -527,14 +527,14 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
             updateItems_SidebarWidget_(d);
         }
         else if (equal_Command(cmd, "bookmark.copy")) {
-            const iSidebarItem *item = d->menuItem; //hoverItem_ListWidget(d->list);
+            const iSidebarItem *item = d->menuItem;
             if (d->mode == bookmarks_SidebarMode && item) {
                 SDL_SetClipboardText(cstr_String(&item->url));
             }
             return iTrue;
         }
         else if (equal_Command(cmd, "bookmark.edit")) {
-            const iSidebarItem *item = d->menuItem; //hoverItem_ListWidget(d->list);
+            const iSidebarItem *item = d->menuItem;
             if (d->mode == bookmarks_SidebarMode && item) {
                 setFlags_Widget(w, disabled_WidgetFlag, iTrue);
                 iWidget *dlg = makeBookmarkEditor_Widget();
@@ -660,6 +660,7 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                     &item->url,
                     collect_String(newRange_String(urlHost_String(&item->url))),
                     0x1f310 /* globe */);
+                postCommand_App("focus.set id:bmed.title");
             }
         }
         else if (equal_Command(cmd, "history.clear")) {
@@ -678,7 +679,7 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
             }
             return iTrue;
         }
-    }    
+    }
     if (ev->type == SDL_MOUSEMOTION && !isVisible_Widget(d->menu)) {
         const iInt2 mouse = init_I2(ev->motion.x, ev->motion.y);
         if (contains_Widget(d->resizer, mouse)) {
@@ -733,7 +734,9 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
             }
         }
     }
-    processContextMenuEvent_Widget(d->menu, ev, {});
+    if (hoverItem_ListWidget(d->list) || isVisible_Widget(d->menu)) {
+        processContextMenuEvent_Widget(d->menu, ev, {});
+    }
     return processEvent_Widget(w, ev);
 }