diff --git a/resources/css/cp.css b/resources/css/cp.css
index 9ab90a8f5bc..5e98e47c76c 100644
--- a/resources/css/cp.css
+++ b/resources/css/cp.css
@@ -16,7 +16,7 @@
 
 /* Components */
 @import './components/array.css';
-/* @import './components/assets.css'; */
+@import './components/assets.css';
 @import './components/blueprints.css';
 @import './components/cards.css';
 @import './components/column-picker.css';
diff --git a/resources/js/components/assets/AssetManager.vue b/resources/js/components/assets/AssetManager.vue
index 24d2ecba9e2..cf0a4a2558a 100644
--- a/resources/js/components/assets/AssetManager.vue
+++ b/resources/js/components/assets/AssetManager.vue
@@ -3,7 +3,7 @@
         ref="browser"
         :can-create-containers="canCreateContainers"
         :create-container-url="createContainerUrl"
-        :initial-container="container"
+        :container="container"
         :initial-per-page="$config.get('paginationSize')"
         :initial-editing-asset-id="initialEditingAssetId"
         :selected-path="path"
@@ -18,7 +18,7 @@
 <script>
 export default {
     props: {
-        initialContainer: Object,
+        container: Object,
         initialPath: String,
         initialEditingAssetId: String,
         actions: Array,
@@ -28,7 +28,6 @@ export default {
 
     data() {
         return {
-            container: this.initialContainer,
             path: this.initialPath,
             selectedAssets: [],
         };
@@ -49,7 +48,6 @@ export default {
             window.history.replaceState({ container: { ...this.container }, path: this.path }, '');
 
             window.onpopstate = (e) => {
-                this.container = e.state.container;
                 this.path = e.state.path;
             };
         },
@@ -60,10 +58,9 @@ export default {
         },
 
         /**
-         * When a user has navigated to another folder or container
+         * When a user has navigated to another folder.
          */
-        navigate(container, path) {
-            this.container = container;
+        navigate(path) {
             this.path = path;
             this.pushState();
 
diff --git a/resources/js/components/assets/Browser/AssetBrowserMixin.js b/resources/js/components/assets/Browser/AssetBrowserMixin.js
index 0ea81f5e0f4..3a346809118 100644
--- a/resources/js/components/assets/Browser/AssetBrowserMixin.js
+++ b/resources/js/components/assets/Browser/AssetBrowserMixin.js
@@ -8,6 +8,25 @@ export default {
         folders: Array,
         path: String,
         restrictFolderNavigation: Boolean,
+        creatingFolder: Boolean,
+    },
+
+    data() {
+        return {
+            newFolderName: null,
+            draggingAsset: null,
+            draggingFolder: null,
+        }
+    },
+
+    watch: {
+        draggingAsset() {
+            this.$emit('prevent-dragging', this.draggingAsset !== null);
+        },
+
+        draggingFolder() {
+            this.$emit('prevent-dragging', this.draggingFolder !== null);
+        },
     },
 
     methods: {
@@ -30,5 +49,65 @@ export default {
         selectFolder(path) {
             this.$emit('select-folder', path);
         },
+
+        focusNewFolderInput() {
+            this.$refs.newFolderInput?.edit();
+        },
+
+        clearNewFolderName() {
+            this.newFolderName = null;
+        },
+
+        canMoveAsset(asset) {
+            return asset.actions.some((action) => action.handle === 'move_asset');
+        },
+
+        canMoveFolder(folder) {
+            return folder.actions.some((action) => action.handle === 'move_asset_folder');
+        },
+
+        handleFolderDrop(destinationFolder) {
+            if (this.draggingAsset) {
+                let asset = this.assets.find((asset) => asset.id === this.draggingAsset);
+                let action = asset.actions.find((action) => action.handle === 'move_asset');
+
+                if (!action) {
+                    return;
+                }
+
+                const payload = {
+                    action: action.handle,
+                    context: action.context,
+                    selections: [this.draggingAsset],
+                    values: { folder: destinationFolder.path },
+                };
+
+                this.$axios
+                    .post(this.actionUrl, payload)
+                    .then(response => this.$emit('action-completed', true, response))
+                    .finally(() => this.draggingAsset = null);
+            }
+
+            if (this.draggingFolder) {
+                let folder = this.folders.find((folder) => folder.path === this.draggingFolder);
+                let action = folder.actions.find((action) => action.handle === 'move_asset_folder');
+
+                if (!action) {
+                    return;
+                }
+
+                const payload = {
+                    action: action.handle,
+                    context: action.context,
+                    selections: [this.draggingFolder],
+                    values: { folder: destinationFolder.path },
+                };
+
+                this.$axios
+                    .post(this.folderActionUrl, payload)
+                    .then(response => this.$emit('action-completed', true, response))
+                    .finally(() => this.draggingFolder = null);
+            }
+        },
     },
 };
diff --git a/resources/js/components/assets/Browser/Browser.vue b/resources/js/components/assets/Browser/Browser.vue
index bf374e44350..a1e31fb6b2d 100644
--- a/resources/js/components/assets/Browser/Browser.vue
+++ b/resources/js/components/assets/Browser/Browser.vue
@@ -1,19 +1,35 @@
 <template>
     <div class="min-h-screen" ref="browser" @keydown.shift="shiftDown" @keyup="clearShift">
         <Header :title="__(container.title)" icon="assets">
-            <dropdown-list v-if="container.can_edit || container.can_delete || container.can_create">
-                <dropdown-item v-if="canCreateContainers" v-text="__('Create Container')" :redirect="createContainerUrl" />
-                <dropdown-item v-if="container.can_edit" v-text="__('Edit Container')" :redirect="container.edit_url" />
-                <dropdown-item v-text="__('Edit Blueprint')" :redirect="container.blueprint_url" />
-                <dropdown-item v-if="container.can_delete" class="warning" @click="$refs.deleter.confirm()">
-                    {{ __('Delete Container') }}
-                    <resource-deleter
-                        ref="deleter"
-                        :resource-title="__(container.title)"
-                        :route="container.delete_url"
+            <Dropdown v-if="container.can_edit || container.can_delete || container.can_create">
+                <DropdownMenu>
+                    <DropdownItem
+                        v-if="canCreateContainers"
+                        :text="__('Create Container')"
+                        :href="createContainerUrl"
                     />
-                </dropdown-item>
-            </dropdown-list>
+                    <DropdownItem
+                        v-if="container.can_edit"
+                        :text="__('Edit Container')"
+                        :href="container.edit_url"
+                    />
+                    <DropdownItem
+                        :text="__('Edit Blueprint')"
+                        :href="container.blueprint_url"
+                    />
+                    <DropdownItem
+                        v-if="container.can_delete"
+                        :text="__('Delete Container')"
+                        @click="$event.preventDefault(); $refs.deleter.confirm()"
+                    />
+                </DropdownMenu>
+            </Dropdown>
+
+            <resource-deleter
+                ref="deleter"
+                :resource-title="__(container.title)"
+                :route="container.delete_url"
+            />
 
             <Button v-if="canUpload" :text="__('Upload')" icon="upload" @click="openFileBrowser" />
             <Button v-if="canCreateFolders" :text="__('Create Folder')" icon="folder-add" @click="creatingFolder = true" />
@@ -33,7 +49,7 @@
             ref="uploader"
             :container="container.id"
             :path="path"
-            :enabled="canUpload"
+            :enabled="!preventDragging && canUpload"
             @updated="uploadsUpdated"
             @upload-complete="uploadCompleted"
             @error="uploadError"
@@ -77,10 +93,7 @@
                                 v-on="sharedAssetEvents"
                                 :columns="columns"
                                 :loading="loading"
-                                :mode="mode"
                                 @sorted="sorted"
-                                @create-folder="createFolder"
-                                @cancel-creating-folder="creatingFolder = false"
                             />
 
                             <!-- Grid Mode -->
@@ -91,8 +104,6 @@
                                 v-on="sharedAssetEvents"
                                 :assets="assets"
                                 :selected-assets="selectedAssets"
-                                @create-folder="createFolder"
-                                @cancel-creating-folder="creatingFolder = false"
                                 @toggle-selection="toggleSelection"
                             >
                                 <template #footer>
@@ -135,6 +146,8 @@
             v-if="showAssetEditor"
             :id="editedAssetId"
             :read-only="!canEdit"
+            @previous="editPreviousAsset"
+            @next="editNextAsset"
             @closed="closeAssetEditor"
             @saved="assetSaved"
         />
@@ -152,12 +165,12 @@ import Uploader from '../Uploader.vue';
 import Uploads from '../Uploads.vue';
 import HasActions from '../../data-list/HasActions';
 import { keyBy, sortBy } from 'lodash-es';
-import { Header, Button } from '@statamic/ui';
+import { Header, Button, Dropdown, DropdownItem, DropdownMenu } from '@statamic/ui';
 
 export default {
     mixins: [HasActions, HasPagination, HasPreferences],
 
-    components: { AssetThumbnail, AssetEditor, Uploader, Uploads, Grid, Table, Header, Button },
+    components: { DropdownMenu, DropdownItem, Dropdown, AssetThumbnail, AssetEditor, Uploader, Uploads, Grid, Table, Header, Button },
 
     props: {
         allowSelectingExistingUpload: Boolean,
@@ -165,7 +178,7 @@ export default {
         autoselectUploads: Boolean,
         canCreateContainers: Boolean,
         createContainerUrl: String,
-        initialContainer: Object,
+        container: Object,
         initialEditingAssetId: String,
         maxFiles: Number,
         queryScopes: Array,
@@ -188,7 +201,6 @@ export default {
                 },
             ],
             containers: [],
-            container: {},
             initializing: true,
             loading: true,
             assets: [],
@@ -202,20 +214,20 @@ export default {
             page: 1,
             preferencesPrefix: null,
             meta: {},
-            sortColumn: this.initialContainer.sort_field,
-            sortDirection: this.initialContainer.sort_direction,
+            sortColumn: this.container.sort_field,
+            sortDirection: this.container.sort_direction,
             mode: 'table',
             actionUrl: null,
             folderActionUrl: null,
             shifting: false,
             lastItemClicked: null,
-            actionOpened: null,
+            preventDragging: false,
         };
     },
 
     computed: {
         actionContext() {
-            return { container: this.selectedContainer };
+            return { container: this.container.id };
         },
 
         canCreateFolders() {
@@ -276,10 +288,6 @@ export default {
             return this.selectedAssets.length >= this.maxFiles;
         },
 
-        selectedContainer() {
-            return typeof this.initialContainer === 'object' ? this.initialContainer.id : this.initialContainer;
-        },
-
         showAssetEditor() {
             return Boolean(this.editedAssetId);
         },
@@ -305,33 +313,32 @@ export default {
                 'edit': this.edit,
                 'edit-asset': (event) => this.$emit('edit-asset', event),
                 'select-folder': this.selectFolder,
+                'create-folder': this.createFolder,
+                'cancel-creating-folder': () => (this.creatingFolder = false),
+                'prevent-dragging': (preventDragging) => (this.preventDragging = preventDragging),
             };
         },
     },
 
-    mounted() {
-        this.loadContainers();
-    },
-
     created() {
         this.$events.$on('editor-action-started', this.actionStarted);
         this.$events.$on('editor-action-completed', this.actionCompleted);
     },
 
+    mounted() {
+        this.initializing = true;
+        this.preferencesPrefix = `assets.${this.container.id}`;
+        this.mode = this.getPreference('mode') || 'table';
+        this.setInitialPerPage();
+        this.loadAssets();
+    },
+
     unmounted() {
         this.$events.$off('editor-action-started', this.actionStarted);
         this.$events.$off('editor-action-completed', this.actionCompleted);
     },
 
     watch: {
-        container(container) {
-            this.initializing = true;
-            this.preferencesPrefix = `assets.${container.id}`;
-            this.mode = this.getPreference('mode') || 'table';
-            this.setInitialPerPage();
-            this.loadAssets();
-        },
-
         mode(mode) {
             this.setPreference('mode', mode == 'table' ? null : mode);
         },
@@ -341,11 +348,7 @@ export default {
                 ? [this.path, this.editedAssetBasename].filter((value) => value != '/').join('/') + '/edit'
                 : this.path;
 
-            this.$emit('navigated', this.container, path);
-        },
-
-        initialContainer() {
-            this.container = this.initialContainer;
+            this.$emit('navigated', path);
         },
 
         initializing(isInitializing, wasInitializing) {
@@ -386,13 +389,7 @@ export default {
             this.loadAssets();
         },
 
-        assetDeleted() {
-            this.closeAssetEditor();
-            this.loadAssets();
-        },
-
         assetSaved() {
-            this.closeAssetEditor();
             this.loadAssets();
         },
 
@@ -400,6 +397,66 @@ export default {
             this.shifting = false;
         },
 
+        async editPreviousAsset() {
+            let currentAssetIndex = this.assets.findIndex((asset) => asset.id === this.editedAssetId);
+
+            // When we're editing the first asset on the page, navigating to the previous asset
+            // requires us to load the previous page of assets, if there is one.
+            if (currentAssetIndex === 0) {
+                if (this.page > 1) {
+                    this.page = this.page - 1;
+                    await this.loadAssets();
+
+                    if (this.assets.length > 0) {
+                        this.editedAssetId = null;
+
+                        this.$nextTick(() => {
+                            this.editedAssetId = this.assets.slice(-1)[0].id;
+                        });
+                    }
+                }
+
+                this.editedAssetId = null;
+                return;
+            }
+
+            this.editedAssetId = null;
+
+            this.$nextTick(() => {
+                this.editedAssetId = this.assets.slice(currentAssetIndex - 1, currentAssetIndex)[0].id;
+            });
+        },
+
+        async editNextAsset() {
+            let currentAssetIndex = this.assets.findIndex((asset) => asset.id === this.editedAssetId);
+
+            // When we're editing the last asset on the page, navigating to the next asset
+            // requires us to load the next page of assets, if there is one.
+            if (currentAssetIndex === this.assets.length - 1) {
+                if (this.meta.last_page > this.page) {
+                    this.page = this.page + 1;
+                    await this.loadAssets();
+
+                    if (this.assets.length > 0) {
+                        this.editedAssetId = null;
+
+                        this.$nextTick(() => {
+                            this.editedAssetId = this.assets[0].id;
+                        });
+                    }
+                }
+
+                this.editedAssetId = null;
+                return;
+            }
+
+            this.editedAssetId = null;
+
+            this.$nextTick(() => {
+                this.editedAssetId = this.assets.slice(currentAssetIndex + 1, currentAssetIndex + 2)[0].id;
+            });
+        },
+
         closeAssetEditor() {
             this.editedAssetId = null;
         },
@@ -462,7 +519,7 @@ export default {
                   ).replace(/\/$/, '')
                 : cp_url(`assets/browse/folders/${this.container.id}/${this.path || ''}`).replace(/\/$/, '');
 
-            this.$axios
+            return this.$axios
                 .get(url, { params: this.parameters })
                 .then((response) => {
                     const data = response.data;
@@ -491,13 +548,6 @@ export default {
                 });
         },
 
-        loadContainers() {
-            this.$axios.get(cp_url('asset-containers')).then((response) => {
-                this.containers = keyBy(response.data, 'id');
-                this.container = this.containers[this.selectedContainer];
-            });
-        },
-
         openFileBrowser() {
             this.$refs.uploader.browse();
         },
@@ -507,7 +557,7 @@ export default {
             this.path = path;
             this.page = 1;
 
-            this.$emit('navigated', this.container, this.path);
+            this.$emit('navigated', this.path);
         },
 
         selectRange(from, to) {
diff --git a/resources/js/components/assets/Browser/Grid.vue b/resources/js/components/assets/Browser/Grid.vue
index 73e9f30b876..17954c3a3ca 100644
--- a/resources/js/components/assets/Browser/Grid.vue
+++ b/resources/js/components/assets/Browser/Grid.vue
@@ -7,12 +7,17 @@
 
         <ui-card class="space-y-8">
             <!-- Folders -->
-            <section class="folder-grid-listing" v-if="folders.length">
+            <section class="folder-grid-listing" v-if="folders.length || creatingFolder">
                 <div
-                    class="group/folder relative"
+                    v-if="!restrictFolderNavigation"
                     v-for="folder in folders"
                     :key="folder.path"
-                    v-if="!restrictFolderNavigation"
+                    class="group/folder relative"
+                    :draggable="canMoveFolder(folder)"
+                    @dragover.prevent
+                    @drop="handleFolderDrop(folder)"
+                    @dragstart="draggingFolder = folder.path"
+                    @dragend="draggingFolder = null"
                 >
                     <Context>
                         <template #trigger>
@@ -70,6 +75,10 @@
                             <div class="asset-tile group relative" :class="{ 'bg-checkerboard': asset.can_be_transparent }">
                                 <button
                                     class="size-full"
+                                    :draggable="canMoveAsset(asset)"
+                                    @dragover.prevent
+                                    @dragstart="draggingAsset = asset.id"
+                                    @dragend="draggingAsset = null"
                                     @click.stop="toggleSelection(asset.id, index, $event)"
                                     @dblclick.stop="$emit('edit-asset', asset)"
                                 >
@@ -79,6 +88,7 @@
                                                 v-if="asset.is_image"
                                                 :src="asset.thumbnail"
                                                 loading="lazy"
+                                                :draggable="false"
                                                 :class="{
                                                     'size-full p-4': asset.extension === 'svg',
                                                     'rounded-lg p-1': asset.orientation === 'square',
@@ -140,6 +150,7 @@ import { Context, ContextMenu, ContextItem, ContextLabel, ContextSeparator, Edit
 
 export default {
     mixins: [AssetBrowserMixin],
+
     components: {
         ContextItem,
         ContextLabel,
@@ -153,29 +164,29 @@ export default {
         EditableRoot,
         Breadcrumbs,
     },
+
     props: {
         assets: { type: Array },
         selectedAssets: { type: Array },
-        creatingFolder: { type: Boolean },
     },
 
     data() {
         return {
+            actionOpened: null,
             thumbnailSize: 200,
-            newFolderName: null,
         };
     },
 
     watch: {
         thumbnailSize: {
             handler: debounce(function(size) {
-                this.$preferences.set('asset-browser-thumbnail-size', size);
+                this.$preferences.set('assets.browser_thumbnail_size', size);
             }, 300)
-        }
+        },
     },
 
     mounted() {
-        const savedSize = this.$preferences.get('asset-browser-thumbnail-size');
+        const savedSize = this.$preferences.get('assets.browser_thumbnail_size');
         if (savedSize) this.thumbnailSize = savedSize;
     },
 
@@ -204,14 +215,6 @@ export default {
         toggleSelection(id, index, $event) {
             this.$emit('toggle-selection', id, index, $event);
         },
-
-        focusNewFolderInput() {
-            this.$refs.newFolderInput?.edit();
-        },
-
-        clearNewFolderName() {
-            this.newFolderName = null;
-        },
     },
 };
 </script>
diff --git a/resources/js/components/assets/Browser/Table.vue b/resources/js/components/assets/Browser/Table.vue
index be86df20a9a..36836ba0f12 100644
--- a/resources/js/components/assets/Browser/Table.vue
+++ b/resources/js/components/assets/Browser/Table.vue
@@ -1,6 +1,7 @@
 <template>
     <Panel class="relative overflow-x-auto overscroll-x-contain">
         <data-list-table
+            ref="dataListTable"
             :allow-bulk-actions="true"
             :loading="loading"
             :toggle-selection-on-row-click="true"
@@ -21,9 +22,15 @@
                     <td :colspan="columns.length" />
                 </tr>
                 <tr
+                    v-if="!restrictFolderNavigation"
                     v-for="(folder, i) in folders"
                     :key="folder.path"
-                    v-if="!restrictFolderNavigation"
+                    class="pointer-events-auto"
+                    :draggable="canMoveFolder(folder)"
+                    @dragover.prevent
+                    @drop="handleFolderDrop(folder)"
+                    @dragstart="draggingFolder = folder.path"
+                    @dragend="draggingFolder = null"
                 >
                     <td />
                     <td @click="selectFolder(folder.path)">
@@ -81,7 +88,13 @@
             </template>
 
             <template #cell-basename="{ row: asset, checkboxId }">
-                <div class="w-fit-content group flex items-center">
+                <div
+                    class="w-fit-content group flex items-center"
+                    :draggable="canMoveAsset(asset)"
+                    @dragover.prevent
+                    @dragstart="draggingAsset = asset.id"
+                    @dragend="draggingAsset = null"
+                >
                     <asset-thumbnail
                         :asset="asset"
                         :square="true"
@@ -132,6 +145,8 @@ import AssetBrowserMixin from './AssetBrowserMixin';
 import { Panel, Dropdown, DropdownMenu, DropdownItem, DropdownLabel, DropdownSeparator, Editable } from '@statamic/ui';
 
 export default {
+    mixins: [AssetBrowserMixin],
+
     components: {
         Editable,
         AssetThumbnail,
@@ -144,32 +159,21 @@ export default {
         DropdownSeparator,
     },
 
-    mixins: [AssetBrowserMixin],
-
     props: {
         loading: Boolean,
         columns: Array,
-        creatingFolder: { type: Boolean },
     },
 
-    data() {
-        return {
-            newFolderName: null,
-        };
+    computed: {
+        assets() {
+            return this.$refs.dataListTable.rows;
+        },
     },
 
     methods: {
         sorted(column, direction) {
             this.$emit('sorted', column, direction);
         },
-
-        focusNewFolderInput() {
-            this.$refs.newFolderInput?.edit();
-        },
-
-        clearNewFolderName() {
-            this.newFolderName = null;
-        },
     },
 
     watch: {
diff --git a/resources/js/components/assets/Browser/Thumbnail.vue b/resources/js/components/assets/Browser/Thumbnail.vue
index 1e8ae434ef2..41433718084 100644
--- a/resources/js/components/assets/Browser/Thumbnail.vue
+++ b/resources/js/components/assets/Browser/Thumbnail.vue
@@ -5,6 +5,7 @@
             :src="asset.thumbnail"
             class="asset-thumbnail mx-auto max-h-8 max-w-full rounded-sm"
             loading="lazy"
+            :draggable="false"
             :class="{ 'h-8 w-8 object-cover': square }"
         />
         <img
@@ -12,6 +13,7 @@
             :src="asset.url"
             class="asset-thumbnail mx-auto h-8 max-w-full rounded-sm"
             loading="lazy"
+            :draggable="false"
         />
         <file-icon v-else :extension="asset.extension" class="asset-thumbnail h-8 w-8 rounded-sm p-px" />
     </div>
diff --git a/resources/js/components/assets/Editor/Editor.vue b/resources/js/components/assets/Editor/Editor.vue
index 4eb6c9a0cb9..d662b3d94ef 100644
--- a/resources/js/components/assets/Editor/Editor.vue
+++ b/resources/js/components/assets/Editor/Editor.vue
@@ -257,10 +257,16 @@
                         </div>
                     </div>
                     <div class="flex items-center space-x-3 rtl:space-x-reverse">
+                        <button type="button" class="btn" @click="navigateToPreviousAsset">
+                            {{ __('<') }}
+                        </button>
+                        <button type="button" class="btn" @click="navigateToNextAsset">
+                            {{ __('>') }}
+                        </button>
                         <button type="button" class="btn" @click="close">
                             {{ __('Cancel') }}
                         </button>
-                        <button type="button" class="btn-primary" @click="save" v-if="!readOnly">
+                        <button type="button" class="btn-primary" @click="saveAndClose" v-if="!readOnly">
                             {{ __('Save') }}
                         </button>
                     </div>
@@ -296,7 +302,7 @@ import HasHiddenFields from '../../publish/HasHiddenFields';
 import { pick, flatten } from 'lodash-es';
 
 export default {
-    emits: ['saved', 'closed', 'action-completed'],
+    emits: ['previous', 'next', 'saved', 'closed', 'action-completed'],
 
     mixins: [HasHiddenFields],
 
@@ -392,6 +398,12 @@ export default {
 
     mounted() {
         this.load();
+
+        window.addEventListener('keydown', this.keydown);
+    },
+
+    beforeUnmount() {
+        window.removeEventListener('keydown', this.keydown);
     },
 
     events: {
@@ -450,6 +462,32 @@ export default {
             });
         },
 
+        keydown(event) {
+            if ((event.metaKey || event.ctrlKey) && event.key === 'ArrowLeft') {
+                this.navigateToPreviousAsset();
+            }
+
+            if ((event.metaKey || event.ctrlKey) && event.key === 'ArrowRight') {
+                this.navigateToNextAsset();
+            }
+        },
+
+        navigateToPreviousAsset() {
+            if (this.$dirty.has(this.publishContainer)) {
+                this.save();
+            }
+
+            this.$emit('previous');
+        },
+
+        navigateToNextAsset() {
+            if (this.$dirty.has(this.publishContainer)) {
+                this.save();
+            }
+            
+            this.$emit('next');
+        },
+
         openFocalPointEditor() {
             this.showFocalPointEditor = true;
         },
@@ -464,6 +502,13 @@ export default {
             this.$dirty.add(this.publishContainer);
         },
 
+        // We only want to close when clicking the save button, not when saving when navigating between prev/next assets.
+        // TODO: Can likely be refactored when we implement the new publish form components.
+        saveAndClose() {
+            this.save();
+            this.close();
+        },
+
         save() {
             this.saving = true;
             const url = cp_url(`assets/${utf8btoa(this.id)}`);
diff --git a/resources/js/components/ui/Toggle/Group.vue b/resources/js/components/ui/Toggle/Group.vue
index 4c52b5bd6a4..b117698f3b4 100644
--- a/resources/js/components/ui/Toggle/Group.vue
+++ b/resources/js/components/ui/Toggle/Group.vue
@@ -50,14 +50,21 @@ const groupClasses = cva({
 })({
     notGhost: props.variant !== 'ghost',
 });
+
+function updateModelValue(value) {
+    if (value) {
+        emit('update:modelValue', value);
+    }
+}
 </script>
 
 <template>
     <ToggleGroupRoot
-        v-model="toggleState"
         :type="multiple ? 'multiple' : 'single'"
         :class="groupClasses"
         data-ui-toggle-group
+        :model-value="toggleState"
+        @update:model-value="updateModelValue"
     >
         <slot />
     </ToggleGroupRoot>
diff --git a/resources/views/assets/browse.blade.php b/resources/views/assets/browse.blade.php
index 5ce5c1d4981..8c2d203c693 100644
--- a/resources/views/assets/browse.blade.php
+++ b/resources/views/assets/browse.blade.php
@@ -8,7 +8,7 @@
 
 @section('content')
     <asset-manager
-        :initial-container="{{ json_encode($container) }}"
+        :container="{{ json_encode($container) }}"
         :can-create-containers="{{ Statamic\Support\Str::bool($user->can('create', \Statamic\Contracts\Assets\AssetContainer::class)) }}"
         create-container-url="{{ cp_route('asset-containers.create') }}"
         initial-path="{{ $folder }}"
diff --git a/resources/views/assets/containers/index.blade.php b/resources/views/assets/containers/index.blade.php
deleted file mode 100644
index aebe58a0972..00000000000
--- a/resources/views/assets/containers/index.blade.php
+++ /dev/null
@@ -1,22 +0,0 @@
-@php
-    use function Statamic\trans as __;
-@endphp
-
-@extends('statamic::layout')
-@section('title', __('Asset Containers'))
-
-@section('content')
-    <div class="mb-6 flex">
-        <h1 class="flex-1">{{ __('Asset Containers') }}</h1>
-
-        @can('create', 'Statamic\Contracts\Assets\AssetContainer')
-            <a href="{{ cp_route('asset-containers.create') }}" class="btn">{{ __('Create Asset Container') }}</a>
-        @endcan
-    </div>
-
-    <asset-container-list
-        :initial-rows="{{ json_encode($containers) }}"
-        :columns="{{ json_encode($columns) }}"
-        :visible-columns="{{ json_encode($visibleColumns) }}"
-    ></asset-container-list>
-@endsection
diff --git a/src/Http/Controllers/CP/Assets/AssetContainersController.php b/src/Http/Controllers/CP/Assets/AssetContainersController.php
index 28e1995fe0f..d03fb29629f 100644
--- a/src/Http/Controllers/CP/Assets/AssetContainersController.php
+++ b/src/Http/Controllers/CP/Assets/AssetContainersController.php
@@ -38,15 +38,7 @@ public function index(Request $request)
             ];
         })->values();
 
-        if ($request->wantsJson()) {
-            return $containers;
-        }
-
-        return view('statamic::assets.containers.index', [
-            'containers' => $containers->all(),
-            'columns' => ['title'],
-            'visibleColumns' => ['title'],
-        ]);
+        return $containers;
     }
 
     public function edit($container)
diff --git a/src/Http/Controllers/CP/Assets/BrowserController.php b/src/Http/Controllers/CP/Assets/BrowserController.php
index f394ff73858..d155771b92a 100644
--- a/src/Http/Controllers/CP/Assets/BrowserController.php
+++ b/src/Http/Controllers/CP/Assets/BrowserController.php
@@ -44,6 +44,8 @@ public function show($container, $path = '/')
                 'blueprint_url' => cp_route('asset-containers.blueprint.edit', $container->handle()),
                 'can_edit' => User::current()->can('edit', $container),
                 'can_delete' => User::current()->can('delete', $container),
+                'allow_uploads' => $container->allowUploads(),
+                'create_folders' => $container->createFolders(),
                 'sort_field' => $container->sortField(),
                 'sort_direction' => $container->sortDirection(),
             ],
diff --git a/tests/Feature/AssetContainers/ListAssetContainersTest.php b/tests/Feature/AssetContainers/ListAssetContainersTest.php
index 71a96c8fd85..8b2dd4a51c8 100644
--- a/tests/Feature/AssetContainers/ListAssetContainersTest.php
+++ b/tests/Feature/AssetContainers/ListAssetContainersTest.php
@@ -30,23 +30,6 @@ public function it_lists_containers_you_have_access_to_when_requested_as_json()
             ->assertJson($this->containerArray());
     }
 
-    #[Test]
-    public function it_loads_a_view_when_requested_normally()
-    {
-        $this->setTestRoles(['test' => ['access cp', 'view two assets', 'view three assets']]);
-        $user = User::make()->assignRole('test')->save();
-        AssetContainer::make('one')->save();
-        AssetContainer::make('two')->save();
-        AssetContainer::make('three')->save();
-
-        $this
-            ->actingAs($user)
-            ->get(cp_route('asset-containers.index'))
-            ->assertSuccessful()
-            ->assertViewIs('statamic::assets.containers.index')
-            ->assertViewHas('containers', $this->containerArray());
-    }
-
     public function containerArray()
     {
         return [