diff --git a/src/Actions/RenameAssetFolder.php b/src/Actions/RenameAssetFolder.php
index 2652d1f9bd..0b7c61c767 100644
--- a/src/Actions/RenameAssetFolder.php
+++ b/src/Actions/RenameAssetFolder.php
@@ -47,7 +47,10 @@ protected function fieldItems()
                 'validate' => ['required', 'string', new AlphaDashSpace],
                 'classes' => 'mousetrap',
                 'focus' => true,
+                'default' => $value = $this->items->containsOneItem() ? $this->items->first()->basename() : null,
+                'placeholder' => $value,
                 'debounce' => false,
+                'autoselect' => true,
             ],
         ];
     }
diff --git a/src/Http/Controllers/CP/Assets/BrowserController.php b/src/Http/Controllers/CP/Assets/BrowserController.php
index a7f6fbfb06..9d5493fcb8 100644
--- a/src/Http/Controllers/CP/Assets/BrowserController.php
+++ b/src/Http/Controllers/CP/Assets/BrowserController.php
@@ -112,7 +112,7 @@ public function folder(Request $request, $container, $path = '/')
             'data' => [
                 'assets' => FolderAsset::collection($assets ?? collect())->resolve(),
                 'folder' => array_merge((new Folder($folder))->resolve(), [
-                    'folders' => $folders->values(),
+                    'folders' => Folder::collection($folders->values()),
                 ]),
             ],
             'links' => [