diff --git a/src-web/components/CreateDropdown.tsx b/src-web/components/CreateDropdown.tsx
index b61088cf..e9f89738 100644
--- a/src-web/components/CreateDropdown.tsx
+++ b/src-web/components/CreateDropdown.tsx
@@ -1,3 +1,4 @@
+import { useActiveRequest } from '../hooks/useActiveRequest';
 import { useCreateDropdownItems } from '../hooks/useCreateDropdownItems';
 import type { DropdownProps } from './core/Dropdown';
 import { Dropdown } from './core/Dropdown';
@@ -7,7 +8,13 @@ interface Props extends Omit<DropdownProps, 'items'> {
 }
 
 export function CreateDropdown({ hideFolder, children, ...props }: Props) {
-  const items = useCreateDropdownItems({ hideFolder, hideIcons: true });
+  const activeRequest = useActiveRequest();
+  const folderId = activeRequest?.folderId ?? null;
+  const items = useCreateDropdownItems({
+    hideFolder,
+    hideIcons: true,
+    folderId,
+  });
   return (
     <Dropdown items={items} {...props}>
       {children}
diff --git a/src-web/hooks/useCreateDropdownItems.tsx b/src-web/hooks/useCreateDropdownItems.tsx
index 360b34e8..498e1d80 100644
--- a/src-web/hooks/useCreateDropdownItems.tsx
+++ b/src-web/hooks/useCreateDropdownItems.tsx
@@ -13,7 +13,7 @@ export function useCreateDropdownItems({
 }: {
   hideFolder?: boolean;
   hideIcons?: boolean;
-  folderId?: string;
+  folderId?: string | null;
 } = {}): DropdownItem[] {
   const createHttpRequest = useCreateHttpRequest();
   const createGrpcRequest = useCreateGrpcRequest();
diff --git a/src-web/hooks/useCreateFolder.ts b/src-web/hooks/useCreateFolder.ts
index 470a7edc..7ce60490 100644
--- a/src-web/hooks/useCreateFolder.ts
+++ b/src-web/hooks/useCreateFolder.ts
@@ -2,13 +2,11 @@ import { useMutation } from '@tanstack/react-query';
 import type { Folder } from '@yaakapp/api';
 import { trackEvent } from '../lib/analytics';
 import { invokeCmd } from '../lib/tauri';
-import { useActiveRequest } from './useActiveRequest';
 import { useActiveWorkspace } from './useActiveWorkspace';
 import { usePrompt } from './usePrompt';
 
 export function useCreateFolder() {
   const workspace = useActiveWorkspace();
-  const activeRequest = useActiveRequest();
   const prompt = usePrompt();
 
   return useMutation<Folder, unknown, Partial<Pick<Folder, 'name' | 'sortPriority' | 'folderId'>>>({
@@ -29,7 +27,6 @@ export function useCreateFolder() {
           placeholder: 'Name',
         }));
       patch.sortPriority = patch.sortPriority || -Date.now();
-      patch.folderId = patch.folderId || activeRequest?.folderId;
       return invokeCmd('cmd_create_folder', { workspaceId: workspace.id, ...patch });
     },
     onSettled: () => trackEvent('folder', 'create'),