8 files changed, 195 insertions, 146 deletions

diff --git a/src/ui/bindingswidget.c b/src/ui/bindingswidget.c
index 4cf8df8e..13f9434e 100644
--- a/src/ui/bindingswidget.c
+++ b/src/ui/bindingswidget.c
@@ -143,12 +143,16 @@ static void setActiveItem_BindingsWidget_(iBindingsWidget *d, size_t pos) {
         item->isWaitingForEvent = iTrue;
         invalidateItem_ListWidget(d->list, d->activePos);
     }
-#if defined (iPlatformAppleDesktop)
+#if defined (iPlatformAppleDesktop) && defined (iHaveNativeContextMenus)
     /* Native menus must be disabled while grabbing keys so the shortcuts don't trigger. */
     const iBool enableNativeMenus = (d->activePos == iInvalidPos);
+    enableMenu_MacOS("${menu.title.file}", enableNativeMenus);
     enableMenu_MacOS("${menu.title.edit}", enableNativeMenus);
     enableMenu_MacOS("${menu.title.view}", enableNativeMenus);
+    enableMenu_MacOS("${menu.title.bookmarks}", enableNativeMenus);
     enableMenu_MacOS("${menu.title.identity}", enableNativeMenus);
+    enableMenuIndex_MacOS(6, enableNativeMenus);
+    enableMenuIndex_MacOS(7, enableNativeMenus);
 #endif
 }
 
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 88e016f3..9b531957 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -56,6 +56,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "visbuf.h"
 #include "visited.h"
 
+#if defined (iPlatformAppleDesktop)
+#   include "macos.h"
+#endif
 #if defined (iPlatformAppleMobile)
 #   include "ios.h"
 #endif
@@ -1934,11 +1937,18 @@ static void enableActions_DocumentWidget_(iDocumentWidget *d, iBool enable) {
 }
 
 static void setLinkNumberMode_DocumentWidget_(iDocumentWidget *d, iBool set) {
-    iChangeFlags(d->flags, showLinkNumbers_DocumentWidgetFlag, set);
-    /* Children have priority when handling events. */
-    enableActions_DocumentWidget_(d, !set);
-    if (d->menu) {
-        setFlags_Widget(d->menu, disabled_WidgetFlag, set);
+    if (((d->flags & showLinkNumbers_DocumentWidgetFlag) != 0) != set) {
+        iChangeFlags(d->flags, showLinkNumbers_DocumentWidgetFlag, set);
+        /* Children have priority when handling events. */
+        enableActions_DocumentWidget_(d, !set);
+#if defined (iPlatformAppleDesktop)
+        enableMenuItemsOnHomeRow_MacOS(!set);
+#endif
+        /* Ensure all keyboard events come here first. */
+        setKeyboardGrab_Widget(set ? as_Widget(d) : NULL);
+        if (d->menu) {
+            setFlags_Widget(d->menu, disabled_WidgetFlag, set);
+        }
     }
 }
 
@@ -2252,10 +2262,6 @@ static void showErrorPage_DocumentWidget_(iDocumentWidget *d, enum iGmStatusCode
             case tooManyRedirects_GmStatusCode:
                 appendFormat_String(src, "=> %s\n", cstr_String(meta));
                 break;
-            case tlsFailure_GmStatusCode:
-//                useBanner = iFalse; /* valid data wasn't received from host */
-//                appendFormat_String(src, ">%s\n", cstr_String(meta));
-                break;
             case tlsServerCertificateExpired_GmStatusCode:
                 makeFooterButtons_DocumentWidget_(
                     d,
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index 44ae3eec..89e95c85 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -205,6 +205,7 @@ static void getColors_LabelWidget_(const iLabelWidget *d, int *bg, int *fg, int
     const iBool    isSel       = (flags & selected_WidgetFlag) != 0;
     const iBool    isFrameless = (flags & frameless_WidgetFlag) != 0;
     const iBool    isButton    = d->click.button != 0;
+    const iBool    isMenuItem  = !cmp_String(id_Widget(parent_Widget(d)), "menu");
     const iBool    isKeyRoot   = (w->root == get_Window()->keyRoot);
     const iBool    isDarkTheme = isDark_ColorTheme(colorTheme_App());
     /* Default color state. */
@@ -229,7 +230,7 @@ static void getColors_LabelWidget_(const iLabelWidget *d, int *bg, int *fg, int
             *bg = uiBackgroundSelected_ColorId;
             if (!isKeyRoot) {
                 *bg = isDark_ColorTheme(colorTheme_App()) ? uiBackgroundUnfocusedSelection_ColorId
-                    : uiMarked_ColorId;
+                                                          : uiMarked_ColorId;
             }
         }
         *fg = uiTextSelected_ColorId;
@@ -294,7 +295,7 @@ static void getColors_LabelWidget_(const iLabelWidget *d, int *bg, int *fg, int
             }
             *fg = *icon = *meta = uiTextPressed_ColorId | permanent_ColorId;
         }
-    }
+        }
     if (((isSel || isHover) && isFrameless) || isPress) {
         /* Ensure that the full label text remains readable. */
         *fg |= permanent_ColorId;
@@ -429,7 +430,7 @@ static void draw_LabelWidget_(const iLabelWidget *d) {
             moved_Rect(
                 adjusted_Rect(bounds,
                               init_I2(iconPad * (flags & tight_WidgetFlag ? 1.0f : 1.5f), 0),
-                              init_I2(-iconPad * (flags & tight_WidgetFlag ? 0.5f : 1.0f), 0)),
+                          init_I2(-iconPad * (flags & tight_WidgetFlag ? 0.5f : 1.0f), 0)),
                 d->labelOffset),
             d->flags.alignVisual,
             d->flags.drawAsOutline ? fg : none_ColorId,
@@ -566,20 +567,20 @@ void setTextColor_LabelWidget(iLabelWidget *d, int color) {
 
 void setText_LabelWidget(iLabelWidget *d, const iString *text) {
     if (d) {
-        updateText_LabelWidget(d, text);
-        updateSize_LabelWidget(d);
-        if (isWrapped_LabelWidget(d)) {
-            sizeChanged_LabelWidget_(d);
-        }
+    updateText_LabelWidget(d, text);
+    updateSize_LabelWidget(d);
+    if (isWrapped_LabelWidget(d)) {
+        sizeChanged_LabelWidget_(d);
+}
     }
 }
 
 void setTextCStr_LabelWidget(iLabelWidget *d, const char *text) {
     if (d) {
-        updateTextCStr_LabelWidget(d, text);
-        updateSize_LabelWidget(d);
-        if (isWrapped_LabelWidget(d)) {
-            sizeChanged_LabelWidget_(d);
+    updateTextCStr_LabelWidget(d, text);
+    updateSize_LabelWidget(d);
+    if (isWrapped_LabelWidget(d)) {
+        sizeChanged_LabelWidget_(d);
         }
     }
 }
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index fe8ec939..409d749c 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -125,7 +125,7 @@ struct Impl_SidebarWidget {
     float             widthAsGaps;
     int               buttonFont;
     int               itemFonts[2];
-    size_t            numUnreadEntries;    
+    size_t            numUnreadEntries;
     iWidget *         resizer;
     iWidget *         menu; /* context menu for an item */
     iWidget *         modeMenu; /* context menu for the sidebar mode (no item) */
@@ -266,7 +266,7 @@ static void updateItemsWithFlags_SidebarWidget_(iSidebarWidget *d, iBool keepAct
     clear_ListWidget(d->list);
     releaseChildren_Widget(d->blank);
     if (!keepActions) {
-        releaseChildren_Widget(d->actions);
+    releaseChildren_Widget(d->actions);
     }
     d->actions->rect.size.y = 0;
     destroy_Widget(d->menu);
@@ -350,37 +350,37 @@ static void updateItemsWithFlags_SidebarWidget_(iSidebarWidget *d, iBool keepAct
             }
             /* Actions. */
             if (!isMobile) {
-                if (!keepActions) {
+            if (!keepActions) {
                     addActionButton_SidebarWidget_(d,
                                                    check_Icon " ${sidebar.action.feeds.markallread}",
                                                    "feeds.markallread",
                                                    expand_WidgetFlag | tight_WidgetFlag);
-                    updateSize_LabelWidget(addChildFlags_Widget(d->actions,
-                                         iClob(new_LabelWidget("${sidebar.action.show}", NULL)),
-                                                                frameless_WidgetFlag | tight_WidgetFlag));
-                    const iMenuItem items[] = {
+                updateSize_LabelWidget(addChildFlags_Widget(d->actions,
+                                     iClob(new_LabelWidget("${sidebar.action.show}", NULL)),
+                                                            frameless_WidgetFlag | tight_WidgetFlag));
+                const iMenuItem items[] = {
                         { page_Icon " ${sidebar.action.feeds.showall}", SDLK_u, KMOD_SHIFT, "feeds.mode arg:0" },
                         { circle_Icon " ${sidebar.action.feeds.showunread}", SDLK_u, 0, "feeds.mode arg:1" },
-                    };
-                    iWidget *dropButton = addChild_Widget(
-                        d->actions,
-                        iClob(makeMenuButton_LabelWidget(items[d->feedsMode].label, items, 2)));
-                    setId_Widget(dropButton, "feeds.modebutton");
-                    checkIcon_LabelWidget((iLabelWidget *) dropButton);
-                    setFixedSize_Widget(
-                        dropButton,
+                };
+                iWidget *dropButton = addChild_Widget(
+                    d->actions,
+                    iClob(makeMenuButton_LabelWidget(items[d->feedsMode].label, items, 2)));
+                setId_Widget(dropButton, "feeds.modebutton");
+                checkIcon_LabelWidget((iLabelWidget *) dropButton);
+                setFixedSize_Widget(
+                    dropButton,
                         init_I2(iMaxi(20 * gap_UI,
                                       measure_Text(default_FontId,
                                                    translateCStr_Lang(
                                                        items[findWidestLabel_MenuItem(items, 2)].label))
-                                              .advance.x +
+                                    .advance.x +
                                           13 * gap_UI),
-                                -1));
-                }
-                else {
-                    updateDropdownSelection_LabelWidget(findChild_Widget(d->actions, "feeds.modebutton"),
-                                                        format_CStr(" arg:%d", d->feedsMode));
-                }
+                            -1));
+            }
+            else {
+                updateDropdownSelection_LabelWidget(findChild_Widget(d->actions, "feeds.modebutton"),
+                                                    format_CStr(" arg:%d", d->feedsMode));
+            }
             }
             else {
                 if (!keepActions) {
@@ -605,7 +605,7 @@ static void updateItemsWithFlags_SidebarWidget_(iSidebarWidget *d, iBool keepAct
             setPadding_Widget(div, 0, 0, 0, height_Widget(d->actions));
             addChildFlags_Widget(div, iClob(new_Widget()), expand_WidgetFlag); /* pad */
             if (d->feedsMode == all_FeedsMode) {
-                addChild_Widget(div, iClob(new_LabelWidget("${menu.feeds.refresh}", "feeds.refresh")));
+            addChild_Widget(div, iClob(new_LabelWidget("${menu.feeds.refresh}", "feeds.refresh")));
             }
             else {
                 iLabelWidget *msg = addChildFlags_Widget(div, iClob(new_LabelWidget("${sidebar.empty.unread}", NULL)),
@@ -719,8 +719,8 @@ iBool setMode_SidebarWidget(iSidebarWidget *d, enum iSidebarMode mode) {
 
 void setClosedFolders_SidebarWidget(iSidebarWidget *d, const iIntSet *closedFolders) {
     if (d) {
-        delete_IntSet(d->closedFolders);
-        d->closedFolders = copy_IntSet(closedFolders);
+    delete_IntSet(d->closedFolders);
+    d->closedFolders = copy_IntSet(closedFolders);
     }
 }
 
@@ -840,35 +840,35 @@ void init_SidebarWidget(iSidebarWidget *d, enum iSidebarSide side) {
         setFont_LabelWidget(closeButton, uiLabelBigBold_FontId);
         iConnect(Root, get_Root(), visualOffsetsChanged, d, updateSlidingSheetHeight_SidebarWidget_);
     }
-    iWidget *buttons = new_Widget();
-    setId_Widget(buttons, "buttons");
-    setDrawBufferEnabled_Widget(buttons, iTrue);
-    for (int i = 0; i < max_SidebarMode; i++) {
+        iWidget *buttons = new_Widget();        
+        setId_Widget(buttons, "buttons");
+        setDrawBufferEnabled_Widget(buttons, iTrue);
+        for (int i = 0; i < max_SidebarMode; i++) {
         if (i == identities_SidebarMode && deviceType_App() != desktop_AppDeviceType) {
             /* On mobile, identities are managed via Settings. */
-            continue;
-        }
-        d->modeButtons[i] = addChildFlags_Widget(
-            buttons,
-            iClob(new_LabelWidget(
-                tightModeLabels_[i],
-                format_CStr("%s.mode arg:%d", cstr_String(id_Widget(w)), i))),
-                frameless_WidgetFlag | noBackground_WidgetFlag);
+                continue;
+            }
+            d->modeButtons[i] = addChildFlags_Widget(
+                buttons,
+                iClob(new_LabelWidget(
+                    tightModeLabels_[i],
+                    format_CStr("%s.mode arg:%d", cstr_String(id_Widget(w)), i))),
+                    frameless_WidgetFlag | noBackground_WidgetFlag);
         as_Widget(d->modeButtons[i])->flags2 |= slidingSheetDraggable_WidgetFlag2; /* phone */
-    }
-    setButtonFont_SidebarWidget(d, isPhone ? uiLabelBig_FontId : uiLabel_FontId);
-    addChildFlags_Widget(vdiv,
-                         iClob(buttons),
+        }
+        setButtonFont_SidebarWidget(d, isPhone ? uiLabelBig_FontId : uiLabel_FontId);
+        addChildFlags_Widget(vdiv,
+                             iClob(buttons),
                          arrangeHorizontal_WidgetFlag | resizeWidthOfChildren_WidgetFlag |
                              arrangeHeight_WidgetFlag | resizeToParentWidth_WidgetFlag);
-    setBackgroundColor_Widget(buttons, uiBackgroundSidebar_ColorId);
+        setBackgroundColor_Widget(buttons, uiBackgroundSidebar_ColorId);
     iWidget *content = new_Widget();
     setFlags_Widget(content, resizeChildren_WidgetFlag, iTrue);
     iWidget *listAndActions = makeVDiv_Widget();
     addChild_Widget(content, iClob(listAndActions));
     iWidget *listArea = new_Widget();
     setFlags_Widget(listArea, resizeChildren_WidgetFlag, iTrue);
-    d->list = new_ListWidget();    
+    d->list = new_ListWidget();
     setPadding_Widget(as_Widget(d->list), 0, gap_UI, 0, gap_UI);
     addChild_Widget(listArea, iClob(d->list));
     if (!isPhone) {
@@ -892,7 +892,7 @@ void init_SidebarWidget(iSidebarWidget *d, enum iSidebarSide side) {
         setBackgroundColor_Widget(d->actions, uiBackground_ColorId);
     }
     else {
-        setBackgroundColor_Widget(d->actions, uiBackgroundSidebar_ColorId);
+    setBackgroundColor_Widget(d->actions, uiBackgroundSidebar_ColorId);
     }
     d->contextItem = NULL;
     d->contextIndex = iInvalidPos;
@@ -945,7 +945,7 @@ iBool setButtonFont_SidebarWidget(iSidebarWidget *d, int font) {
 static const iGmIdentity *constHoverIdentity_SidebarWidget_(const iSidebarWidget *d) {
     if (d->mode == identities_SidebarMode) {
         return constHoverIdentity_CertListWidget(d->certList);
-    }
+        }
     return NULL;
 }
 
@@ -1182,26 +1182,26 @@ static iBool handleSidebarCommand_SidebarWidget_(iSidebarWidget *d, const char *
         const int animFlags = easeOut_AnimFlag | softer_AnimFlag;
         if (!isPortraitPhone_App()) {
             if (!isHiding) {
-                setFlags_Widget(w, keepOnTop_WidgetFlag, iFalse);
-                w->rect.size.x = d->widthAsGaps * gap_UI;
-                invalidate_ListWidget(d->list);
-                if (isAnimated) {
-                    setFlags_Widget(w, horizontalOffset_WidgetFlag, iTrue);
-                    setVisualOffset_Widget(
-                        w, (d->side == left_SidebarSide ? -1 : 1) * (w->rect.size.x + safePad), 0, 0);
+            setFlags_Widget(w, keepOnTop_WidgetFlag, iFalse);
+            w->rect.size.x = d->widthAsGaps * gap_UI;
+            invalidate_ListWidget(d->list);
+            if (isAnimated) {
+                setFlags_Widget(w, horizontalOffset_WidgetFlag, iTrue);
+                setVisualOffset_Widget(
+                    w, (d->side == left_SidebarSide ? -1 : 1) * (w->rect.size.x + safePad), 0, 0);
                     setVisualOffset_Widget(w, 0, 300, animFlags);
-                }
             }
-            else if (isAnimated) {
-                setFlags_Widget(w, horizontalOffset_WidgetFlag, iTrue);
-                if (d->side == right_SidebarSide) {
-                    setVisualOffset_Widget(w, visX, 0, 0);
-                    setVisualOffset_Widget(
+        }
+        else if (isAnimated) {
+            setFlags_Widget(w, horizontalOffset_WidgetFlag, iTrue);
+            if (d->side == right_SidebarSide) {
+                setVisualOffset_Widget(w, visX, 0, 0);
+                setVisualOffset_Widget(
                         w, visX + w->rect.size.x + safePad, 300, animFlags);
-                }
-                else {
-                    setFlags_Widget(w, keepOnTop_WidgetFlag, iTrue);
-                    setVisualOffset_Widget(
+            }
+            else {
+                setFlags_Widget(w, keepOnTop_WidgetFlag, iTrue);
+                setVisualOffset_Widget(
                         w, -w->rect.size.x - safePad, 300, animFlags);
                 }
             }
@@ -1222,8 +1222,8 @@ static iBool handleSidebarCommand_SidebarWidget_(iSidebarWidget *d, const char *
                 setVisualOffset_Widget(w, bottom_Rect(rect_Root(w->root)) - w->rect.pos.y, 300, animFlags);
                 if (d->isEditing) {
                     setMobileEditMode_SidebarWidget_(d, iFalse);
-                }
             }
+        }
             showToolbar_Root(w->root, isHiding);
         }
         updateToolbarColors_Root(w->root);
@@ -1231,7 +1231,7 @@ static iBool handleSidebarCommand_SidebarWidget_(iSidebarWidget *d, const char *
         /* BUG: Rearranging because the arrange above didn't fully resolve the height. */
         arrange_Widget(w);
         if (!isPortraitPhone_App()) {
-            updateSize_DocumentWidget(document_App());
+        updateSize_DocumentWidget(document_App());
         }
         if (isVisible_Widget(w)) {
             updateItems_SidebarWidget_(d);
@@ -1337,7 +1337,7 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
             /* In sliding sheet mode, sidebar is resized to fit in the safe area. */
             setPadding_Widget(d->actions, 0, 0, 0, bottomSafeInset_Mobile());
         }
-        return iFalse;
+            return iFalse;
     }
     else if (isMetricsChange_UserEvent(ev)) {
         if (isVisible_Widget(w)) {
@@ -1521,8 +1521,8 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                 iBookmark *bm = get_Bookmarks(bookmarks_App(), item->id);
                 if (flag == subscribed_BookmarkFlag && (bm->flags & flag)) {
                     removeEntries_Feeds(item->id); /* get rid of unsubscribed entries */
-                }
                 bm->flags ^= flag;
+                    }
                 postCommand_App("bookmarks.changed");
             }
             return iTrue;
@@ -1672,10 +1672,10 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                                       0,
                                       format_CStr("!feed.entry.unsubscribe arg:1 ptr:%p", d) } },
                                 2);
-                        }
-                        return iTrue;
-                    }
-                }
+            }
+            return iTrue;
+        }
+            }
             }
         }
         else if (isCommand_Widget(w, ev, "history.delete")) {
@@ -1731,7 +1731,7 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
         /* Update cursor. */
         else if (contains_Widget(w, mouse)) {
             const iSidebarItem *item = constHoverItem_ListWidget(d->list);
-            setCursor_Window(get_Window(),
+                setCursor_Window(get_Window(),
                              item ? (item->listItem.isSeparator ? SDL_SYSTEM_CURSOR_ARROW
                                                                 : SDL_SYSTEM_CURSOR_HAND)
                                   : SDL_SYSTEM_CURSOR_ARROW);
@@ -1791,9 +1791,9 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                                             isRead ? circle_Icon " ${feeds.entry.markunread}"
                                                    : circleWhite_Icon " ${feeds.entry.markread}");
                 }
-            }
-        }
-    }
+                            }
+                        }
+                    }
     if (ev->type == SDL_KEYDOWN) {
         const int key   = ev->key.keysym.sym;
         const int kmods = keyMods_Sym(ev->key.keysym.mod);
diff --git a/src/ui/util.c b/src/ui/util.c
index e631a092..13bfd92f 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -775,7 +775,7 @@ void makeMenuItems_Widget(iWidget *menu, const iMenuItem *items, size_t n) {
                 drawKey_WidgetFlag | itemFlags);
             setWrap_LabelWidget(label, isInfo);
             if (!isInfo) {
-                haveIcons |= checkIcon_LabelWidget(label);
+            haveIcons |= checkIcon_LabelWidget(label);
             }
             setFlags_Widget(as_Widget(label), disabled_WidgetFlag, isDisabled);
             if (isInfo) {
@@ -935,7 +935,7 @@ static void updateMenuItemFonts_Widget_(iWidget *d) {
             }
             switch (deviceType_App()) {
                 case desktop_AppDeviceType:
-                    setFont_LabelWidget(label, isCaution ? uiLabelBold_FontId : uiLabel_FontId);
+                setFont_LabelWidget(label, isCaution ? uiLabelBold_FontId : uiLabel_FontId);
                     break;
                 case tablet_AppDeviceType:
                     setFont_LabelWidget(label, isCaution ? uiLabelMediumBold_FontId : uiLabelMedium_FontId);
@@ -1084,8 +1084,9 @@ void openMenuFlags_Widget(iWidget *d, iInt2 windowCoord, int menuOpenFlags) {
     }
     arrange_Widget(d); /* need to know the height */
     iBool allowOverflow = iFalse;
-    /* A vertical offset determined by a possible selected label in the menu. */
-    if (deviceType_App() == desktop_AppDeviceType) {
+    /* A vertical offset determined by a possible selected label in the menu. */ 
+    if (deviceType_App() == desktop_AppDeviceType &&
+        windowCoord.y < rootSize.y - lineHeight_Text(uiNormal_FontSize) * 3) {
         iConstForEach(ObjectList, child, children_Widget(d)) {
             const iWidget *item = constAs_Widget(child.object);
             if (flags_Widget(item) & selected_WidgetFlag) {
@@ -1171,7 +1172,7 @@ void openMenuFlags_Widget(iWidget *d, iInt2 windowCoord, int menuOpenFlags) {
     arrange_Widget(d);
     if (!isSlidePanel) {
         /* LAYOUT BUG: Height of wrapped menu items is incorrect with a single arrange! */
-        arrange_Widget(d);
+    arrange_Widget(d);
     }
     if (deviceType_App() == phone_AppDeviceType) {
         if (isSlidePanel) {
@@ -1379,6 +1380,32 @@ void updateDropdownSelection_LabelWidget(iLabelWidget *dropButton, const char *s
     }
 }
 
+const char *selectedDropdownCommand_LabelWidget(const iLabelWidget *dropButton) {
+    if (!dropButton) {
+        return "";
+    }
+    iWidget *menu = findChild_Widget(constAs_Widget(dropButton), "menu");
+    if (flags_Widget(menu) & nativeMenu_WidgetFlag) {
+        iConstForEach(Array, i, userData_Object(menu)) {
+            const iMenuItem *item = i.value;
+            if (item->label && startsWithCase_CStr(item->label, "###")) {
+                return item->command ? item->command : "";
+            }
+        }        
+    }
+    else {
+        iForEach(ObjectList, i, children_Widget(menu)) {
+            if (isInstance_Object(i.object, &Class_LabelWidget)) {
+                iLabelWidget *item = i.object;
+                if (flags_Widget(i.object) & selected_WidgetFlag) {
+                    return cstr_String(command_LabelWidget(item));
+                }
+            }
+        }
+    }
+    return "";
+}
+
 /*-----------------------------------------------------------------------------------------------*/
 
 static iBool isTabPage_Widget_(const iWidget *tabs, const iWidget *page) {
@@ -1831,10 +1858,10 @@ iWidget *makeValueInput_Widget(iWidget *parent, const iString *initialValue, con
         addChild_Widget(parent, iClob(dlg));
     }
     if (deviceType_App() == desktop_AppDeviceType) { /* conserve space on mobile */
-        setId_Widget(
+    setId_Widget(
             addChildFlags_Widget(dlg, iClob(new_LabelWidget(title, NULL)),
                                  frameless_WidgetFlag),
-            "valueinput.title");
+        "valueinput.title");
     }
     iLabelWidget *promptLabel;
     setId_Widget(addChildFlags_Widget(
@@ -1864,8 +1891,8 @@ iWidget *makeValueInput_Widget(iWidget *parent, const iString *initialValue, con
     }
     pushBack_Array(&actions, &(iMenuItem){
         acceptLabel,
-        SDLK_RETURN,
-        acceptKeyMod_ReturnKeyBehavior(prefs_App()->returnKey),
+                                         SDLK_RETURN,
+                                         acceptKeyMod_ReturnKeyBehavior(prefs_App()->returnKey),
         "valueinput.accept"
     });
     addChildPos_Widget(dlg,
@@ -2352,6 +2379,7 @@ iWidget *makePreferences_Widget(void) {
                                     { u8"Interlingua - ia", 0, 0, "uilang id:ia" },
                                     { u8"Interlingue - ie", 0, 0, "uilang id:ie" },
                                     { u8"Interslavic - isv", 0, 0, "uilang id:isv" },
+                                    { u8"Nederlands - nl", 0, 0, "uilang id:nl" },
                                     { u8"Polski - pl", 0, 0, "uilang id:pl" },
                                     { u8"Русский - ru", 0, 0, "uilang id:ru" },
                                     { u8"Slovak - sk", 0, 0, "uilang id:sk" },
@@ -2519,8 +2547,8 @@ iWidget *makePreferences_Widget(void) {
             { "buttons id:prefs.mono", 0, 0, (const void *) monoFontItems },
             { "padding" },
             { "dropdown id:prefs.font.monodoc", 0, 0, (const void *) constData_Array(makeFontItems_("monodoc")) },
-            { "padding" },
             { "toggle id:prefs.font.warnmissing" },
+            { "padding" },
             { "heading id:prefs.gemtext.ansi" },
             { "toggle id:prefs.gemtext.ansi.fg" },
             { "toggle id:prefs.gemtext.ansi.bg" },
@@ -2528,8 +2556,8 @@ iWidget *makePreferences_Widget(void) {
 //            { "toggle id:prefs.font.smooth" },
 //            { "padding" },
 //            { "dropdown id:prefs.font.ui", 0, 0, (const void *) constData_Array(makeFontItems_("ui")) },
-            { "padding" },
             { "button text:" fontpack_Icon " " uiTextAction_ColorEscape "${menu.fonts}", 0, 0, "!open url:about:fonts" },
+            { "padding" },
             { NULL }  
         };
         const iMenuItem stylePanelItems[] = {
@@ -2994,47 +3022,47 @@ iWidget *makeBookmarkEditor_Widget(void) {
     }
     else {
         dlg = makeSheet_Widget("bmed");
-        setId_Widget(addChildFlags_Widget(
-                         dlg,
-                         iClob(new_LabelWidget(uiHeading_ColorEscape "${heading.bookmark.edit}", NULL)),
-                         frameless_WidgetFlag),
-                     "bmed.heading");
-        iWidget *headings, *values;
-        addChild_Widget(dlg, iClob(makeTwoColumns_Widget(&headings, &values)));
-        iInputWidget *inputs[4];
-        /* Folder to add to. */ {
-            addChild_Widget(headings, iClob(makeHeading_Widget("${dlg.bookmark.folder}")));
+    setId_Widget(addChildFlags_Widget(
+                     dlg,
+                     iClob(new_LabelWidget(uiHeading_ColorEscape "${heading.bookmark.edit}", NULL)),
+                     frameless_WidgetFlag),
+                 "bmed.heading");
+    iWidget *headings, *values;
+    addChild_Widget(dlg, iClob(makeTwoColumns_Widget(&headings, &values)));
+    iInputWidget *inputs[4];
+    /* Folder to add to. */ {
+        addChild_Widget(headings, iClob(makeHeading_Widget("${dlg.bookmark.folder}")));
             const iArray *folderItems = makeBookmarkFolderItems_(iFalse);
-            iLabelWidget *folderButton;
-            setId_Widget(addChildFlags_Widget(values,
-                                              iClob(folderButton = makeMenuButton_LabelWidget(
-                                                        widestLabel_MenuItemArray(folderItems),
-                                                        constData_Array(folderItems),
-                                                        size_Array(folderItems))), alignLeft_WidgetFlag),
-                         "bmed.folder");
-        }
+        iLabelWidget *folderButton;
+        setId_Widget(addChildFlags_Widget(values,
+                                     iClob(folderButton = makeMenuButton_LabelWidget(
+                                               widestLabel_MenuItemArray(folderItems),
+                                               constData_Array(folderItems),
+                                               size_Array(folderItems))), alignLeft_WidgetFlag),
+                     "bmed.folder");
+    }
         addDialogInputWithHeading_(headings, values, "${dlg.bookmark.title}", "bmed.title", iClob(inputs[0] = new_InputWidget(0)));
         addDialogInputWithHeading_(headings, values, "${dlg.bookmark.url}",   "bmed.url",   iClob(inputs[1] = new_InputWidget(0)));
         setUrlContent_InputWidget(inputs[1], iTrue);
-        addDialogInputWithHeading_(headings, values, "${dlg.bookmark.tags}",  "bmed.tags",  iClob(inputs[2] = new_InputWidget(0)));
-        addDialogInputWithHeading_(headings, values, "${dlg.bookmark.icon}",  "bmed.icon",  iClob(inputs[3] = new_InputWidget(1)));
-        /* Buttons for special tags. */
-        addChild_Widget(dlg, iClob(makePadding_Widget(gap_UI)));
-        iWidget *special = addChild_Widget(dlg, iClob(makeTwoColumns_Widget(&headings, &values)));
-        setFlags_Widget(special, collapse_WidgetFlag, iTrue);
-        setId_Widget(special, "bmed.special");
-        makeTwoColumnHeading_("${heading.bookmark.tags}", headings, values);
-        addDialogToggle_(headings, values, "${bookmark.tag.home}", "bmed.tag.home");
-        addDialogToggle_(headings, values, "${bookmark.tag.remote}", "bmed.tag.remote");
-        addDialogToggle_(headings, values, "${bookmark.tag.linksplit}", "bmed.tag.linksplit");
-        arrange_Widget(dlg);
-        for (int i = 0; i < 3; ++i) {
-            as_Widget(inputs[i])->rect.size.x = 100 * gap_UI - headings->rect.size.x;
-        }
-        addChild_Widget(dlg, iClob(makePadding_Widget(gap_UI)));
-        addChild_Widget(dlg, iClob(makeDialogButtons_Widget(actions, iElemCount(actions))));
-        addChild_Widget(get_Root()->widget, iClob(dlg));
-        setupSheetTransition_Mobile(dlg, iTrue);
+    addDialogInputWithHeading_(headings, values, "${dlg.bookmark.tags}",  "bmed.tags",  iClob(inputs[2] = new_InputWidget(0)));
+    addDialogInputWithHeading_(headings, values, "${dlg.bookmark.icon}",  "bmed.icon",  iClob(inputs[3] = new_InputWidget(1)));
+    /* Buttons for special tags. */
+    addChild_Widget(dlg, iClob(makePadding_Widget(gap_UI)));
+    iWidget *special = addChild_Widget(dlg, iClob(makeTwoColumns_Widget(&headings, &values)));
+    setFlags_Widget(special, collapse_WidgetFlag, iTrue);
+    setId_Widget(special, "bmed.special");
+    makeTwoColumnHeading_("${heading.bookmark.tags}", headings, values);
+    addDialogToggle_(headings, values, "${bookmark.tag.home}", "bmed.tag.home");
+    addDialogToggle_(headings, values, "${bookmark.tag.remote}", "bmed.tag.remote");
+    addDialogToggle_(headings, values, "${bookmark.tag.linksplit}", "bmed.tag.linksplit");
+    arrange_Widget(dlg);
+    for (int i = 0; i < 3; ++i) {
+        as_Widget(inputs[i])->rect.size.x = 100 * gap_UI - headings->rect.size.x;
+    }
+    addChild_Widget(dlg, iClob(makePadding_Widget(gap_UI)));
+    addChild_Widget(dlg, iClob(makeDialogButtons_Widget(actions, iElemCount(actions))));
+    addChild_Widget(get_Root()->widget, iClob(dlg));
+    setupSheetTransition_Mobile(dlg, iTrue);
     }
     /* Use a recently accessed folder as the default. */
     const uint32_t recentFolderId = recentFolder_Bookmarks(bookmarks_App());
diff --git a/src/ui/util.h b/src/ui/util.h
index 4fedd083..618022b9 100644
--- a/src/ui/util.h
+++ b/src/ui/util.h
@@ -285,6 +285,7 @@ int             checkContextMenu_Widget         (iWidget *, const SDL_Event *ev)
 
 iLabelWidget *  makeMenuButton_LabelWidget          (const char *label, const iMenuItem *items, size_t n);
 void            updateDropdownSelection_LabelWidget (iLabelWidget *dropButton, const char *selectedCommand);
+const char *    selectedDropdownCommand_LabelWidget (const iLabelWidget *dropButton);
 
 /*-----------------------------------------------------------------------------------------------*/
 
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 1ac4326a..9f67b1c7 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -2023,7 +2023,8 @@ iBool isAffectedByVisualOffset_Widget(const iWidget *d) {
 }
 
 void setFocus_Widget(iWidget *d) {
-    iWindow *win = get_Window();
+    iWindow *win = d ? window_Widget(d) : get_Window();
+    iAssert(win);
     if (win->focus != d) {
         if (win->focus) {
             iAssert(!contains_PtrSet(win->focus->root->pendingDestruction, win->focus));
@@ -2038,6 +2039,13 @@ void setFocus_Widget(iWidget *d) {
     }
 }
 
+void setKeyboardGrab_Widget(iWidget *d) {
+    iWindow *win = d ? window_Widget(d) : get_Window();
+    iAssert(win);
+    win->focus = d;
+    /* no notifications sent */
+}
+
 iWidget *focus_Widget(void) {
     return get_Window()->focus;
 }
diff --git a/src/ui/widget.h b/src/ui/widget.h
index eb3004dc..fb7eb5e2 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -327,7 +327,8 @@ void        scrollInfo_Widget           (const iWidget *, iWidgetScrollInfo *inf
 
 int         backgroundFadeColor_Widget  (void);
 
-void        setFocus_Widget         (iWidget *);
+void        setFocus_Widget         (iWidget *); /* widget must be flagged `focusable` */
+void        setKeyboardGrab_Widget  (iWidget *); /* sets focus on any widget */
 iWidget *   focus_Widget            (void);
 void        setHover_Widget         (iWidget *);
 iWidget *   hover_Widget            (void);