diff --git a/src/components/documents/move-to-folder-dialog.tsx b/src/components/documents/move-to-folder-dialog.tsx
index 7e2cae28..66bd2fa7 100644
--- a/src/components/documents/move-to-folder-dialog.tsx
+++ b/src/components/documents/move-to-folder-dialog.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { useMemo, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import { Check, FolderInput } from 'lucide-react';
 import { toast } from 'sonner';
 
@@ -46,6 +46,10 @@ export function MoveToFolderDialog({
   const move = useMoveDocument();
   const [pickedId, setPickedId] = useState<string | null>(currentFolderId);
 
+  useEffect(() => {
+    if (open) setPickedId(currentFolderId);
+  }, [open, currentFolderId]);
+
   const paths = useMemo(() => buildFolderPaths(tree), [tree]);
 
   return (
@@ -60,7 +64,7 @@ export function MoveToFolderDialog({
             <CommandEmpty>No folders match.</CommandEmpty>
             <CommandGroup heading="Special">
               <CommandItem
-                value="__root__"
+                value="Root (no folder)"
                 onSelect={() => setPickedId(null)}
                 className="flex items-center gap-2"
               >