diff --git a/src/app/components/MediaManager.tsx b/src/app/components/MediaManager.tsx
index b127c68..47d8566 100644
--- a/src/app/components/MediaManager.tsx
+++ b/src/app/components/MediaManager.tsx
@@ -676,7 +676,8 @@ export default function MediaManager({ initialPath = '/', rootPath, title, confi
     try {
       await movePath(renameEntry.path, dest);
       toast.success(`Renamed to "${newName}"`);
-      void load(path);
+      if (renameEntry.path === path) navigateTo(dest);
+      else void load(path);
     } catch (e: any) { toast.error(`Rename failed: ${e?.message ?? e}`); }
     finally { setRenameEntry(null); }
   };
@@ -883,17 +884,37 @@ export default function MediaManager({ initialPath = '/', rootPath, title, confi
           <button onClick={() => navigateTo(rootPath ?? '/')} className="p-1 rounded hover:bg-neutral-100 flex-shrink-0" title="Root">
             <Home className="w-4 h-4" />
           </button>
-          {pathParts.map((part, i) => (
-            <div key={i} className="flex items-center gap-1 flex-shrink-0">
-              <ChevronRight className="w-3 h-3 text-neutral-400" />
-              <button
-                onClick={() => navigateTo('/' + pathParts.slice(0, i + 1).join('/'))}
-                className="hover:text-blue-600 hover:underline max-w-[120px] truncate"
-              >
-                {part}
-              </button>
-            </div>
-          ))}
+          {pathParts.map((part, i) => {
+            const isLast    = i === pathParts.length - 1;
+            const isEditing = isLast && renameEntry !== null && renameEntry.path === path;
+            return (
+              <div key={i} className="flex items-center gap-1 flex-shrink-0">
+                <ChevronRight className="w-3 h-3 text-neutral-400" />
+                {isEditing ? (
+                  <input
+                    ref={renameInputRef}
+                    value={renameName}
+                    onChange={e => setRenameName(e.target.value)}
+                    onKeyDown={e => {
+                      if (e.key === 'Enter') void commitRename();
+                      if (e.key === 'Escape') setRenameEntry(null);
+                    }}
+                    onBlur={() => void commitRename()}
+                    onFocus={e => e.currentTarget.select()}
+                    className="px-1 py-0 border border-blue-400 rounded text-sm max-w-[120px] min-w-[60px]"
+                    autoFocus
+                  />
+                ) : (
+                  <button
+                    onClick={() => navigateTo('/' + pathParts.slice(0, i + 1).join('/'))}
+                    className="hover:text-blue-600 hover:underline max-w-[120px] truncate"
+                  >
+                    {part}
+                  </button>
+                )}
+              </div>
+            );
+          })}
         </div>
         {deviceBaseUrl && (
           <div className="text-xs text-neutral-400 mt-0.5 truncate">Base: {deviceBaseUrl}</div>