2 files changed, 23 insertions, 6 deletions

diff --git a/src/app.c b/src/app.c
index c6918eb5..2f4b4fb8 100644
--- a/src/app.c
+++ b/src/app.c
@@ -2766,15 +2766,21 @@ iBool handleCommand_App(const char *cmd) {
         return iTrue;
     }
     else if (equal_Command(cmd, "bookmarks.addfolder")) {
+        const int parentId = argLabel_Command(cmd, "parent");
         if (suffixPtr_Command(cmd, "value")) {
-            add_Bookmarks(d->bookmarks, NULL, collect_String(suffix_Command(cmd, "value")), NULL, 0);
+            uint32_t id = add_Bookmarks(d->bookmarks, NULL,
+                                        collect_String(suffix_Command(cmd, "value")), NULL, 0);
+            if (parentId) {
+                get_Bookmarks(d->bookmarks, id)->parentId = parentId;
+            }
             postCommand_App("bookmarks.changed");
         }
         else {
-            iWidget *dlg = makeValueInput_Widget(get_Root()->widget,
-                                                 collectNewCStr_String(cstr_Lang("dlg.addfolder.defaulttitle")),
-                                                 uiHeading_ColorEscape "${heading.addfolder}", "${dlg.addfolder.prompt}",
-                                                 uiTextAction_ColorEscape "${dlg.addfolder}", "bookmarks.addfolder");
+            iWidget *dlg = makeValueInput_Widget(
+                get_Root()->widget, collectNewCStr_String(cstr_Lang("dlg.addfolder.defaulttitle")),
+                uiHeading_ColorEscape "${heading.addfolder}", "${dlg.addfolder.prompt}",
+                uiTextAction_ColorEscape "${dlg.addfolder}",
+                format_CStr("bookmarks.addfolder parent:%d", parentId));
             setSelectAllOnFocus_InputWidget(findChild_Widget(dlg, "input"), iTrue);
         }
         return iTrue;
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 6c2934ec..e8aa69c1 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -446,7 +446,7 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
                                { "---", 0, 0, NULL },
                                { delete_Icon " " uiTextCaution_ColorEscape "${bookmark.delete}", 0, 0, "bookmark.delete" },
                                { "---", 0, 0, NULL },
-                               { add_Icon " ${menu.newfolder}", 0, 0, "bookmarks.addfolder" },
+                               { add_Icon " ${menu.newfolder}", 0, 0, "bookmark.addfolder" },
                                { reload_Icon " ${bookmarks.reload}", 0, 0, "bookmarks.reload.remote" },
                                { "---", 0, 0, NULL },
                                { upDownArrow_Icon " ${menu.sort.alpha}", 0, 0, "bookmark.sortfolder" } },
@@ -1319,6 +1319,17 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
             }
             return iTrue;
         }
+        else if (isCommand_Widget(w, ev, "bookmark.addfolder")) {
+            const iSidebarItem *item = d->contextItem;
+            if (d->mode == bookmarks_SidebarMode) {
+                postCommandf_App("bookmarks.addfolder parent:%zu",
+                                 !item ? 0
+                                 : item->listItem.isDropTarget
+                                     ? item->id
+                                     : get_Bookmarks(bookmarks_App(), item->id)->parentId);
+            }
+            return iTrue;
+        }
         else if (isCommand_Widget(w, ev, "bookmark.sortfolder")) {
             const iSidebarItem *item = d->contextItem;
             if (d->mode == bookmarks_SidebarMode && item) {