diff --git a/resources/js/bootstrap/components.js b/resources/js/bootstrap/components.js
index b909ca0ff26..ca84b56a9ae 100644
--- a/resources/js/bootstrap/components.js
+++ b/resources/js/bootstrap/components.js
@@ -1,6 +1,7 @@
 import Vue from 'vue'
 import vSelect from 'vue-select'
 import AssetManager from '../components/assets/AssetManager.vue';
+import AssetEditor from '../components/assets/Editor/Editor.vue';
 import Browser from '../components/assets/Browser/Browser.vue';
 import UpdatesBadge from '../components/UpdatesBadge.vue';
 import Container from '../components/publish/Container.vue';
@@ -71,6 +72,7 @@ Vue.component('v-select', vSelect)
 // Core
 Vue.component('asset-manager', AssetManager);
 Vue.component('asset-browser', Browser);
+Vue.component('asset-editor', AssetEditor);
 Vue.component('updates-badge', UpdatesBadge);
 
 // Publish
diff --git a/resources/js/components/assets/Browser/Browser.vue b/resources/js/components/assets/Browser/Browser.vue
index e74bf0f8eac..0b7f54b1282 100644
--- a/resources/js/components/assets/Browser/Browser.vue
+++ b/resources/js/components/assets/Browser/Browser.vue
@@ -281,7 +281,6 @@
 
 <script>
 import AssetThumbnail from './Thumbnail.vue';
-import AssetEditor from '../Editor/Editor.vue';
 import Breadcrumbs from './Breadcrumbs.vue';
 import CreateFolder from './CreateFolder.vue';
 import HasPagination from '../../data-list/HasPagination';
@@ -300,7 +299,6 @@ export default {
 
     components: {
         AssetThumbnail,
-        AssetEditor,
         Breadcrumbs,
         Uploader,
         Uploads,
diff --git a/resources/js/components/fieldtypes/assets/Asset.js b/resources/js/components/fieldtypes/assets/Asset.js
index ab72d882c95..d66c5898e8d 100644
--- a/resources/js/components/fieldtypes/assets/Asset.js
+++ b/resources/js/components/fieldtypes/assets/Asset.js
@@ -1,11 +1,5 @@
-import AssetEditor from '../../assets/Editor/Editor.vue';
-
 export default {
 
-    components: {
-        AssetEditor
-    },
-
     props: {
         asset: Object,
         readOnly: Boolean,
diff --git a/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue b/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue
index 8f1418dd4c6..14c506749c0 100644
--- a/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue
+++ b/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue
@@ -82,7 +82,7 @@
                         append-to="body"
                     >
                         <div class="asset-grid-listing border dark:border-dark-900 rounded overflow-hidden" :class="{ 'rounded-t-none': !isReadOnly && (showPicker || uploads.length) }" ref="assets">
-                            <asset-tile
+                            <asset-tile :is="assetTileComponent"
                                 v-for="asset in assets"
                                 :key="asset.id"
                                 :asset="asset"
@@ -96,7 +96,7 @@
                         </div>
                     </sortable-list>
 
-                    <div class="asset-table-listing" v-if="displayMode === 'list'">
+                    <div class="asset-table-listing" v-else-if="displayMode === 'list'">
                         <table class="table-fixed">
                             <sortable-list
                                 v-model="assets"
@@ -108,7 +108,7 @@
                                 :mirror="false"
                             >
                                 <tbody ref="assets">
-                                    <tr is="assetRow"
+                                    <tr :is="assetRowComponent"
                                         class="asset-row"
                                         v-for="asset in assets"
                                         :key="asset.id"
@@ -124,6 +124,9 @@
                             </sortable-list>
                         </table>
                     </div>
+
+                    <slot :name="displayMode" v-else v-bind="{ assets, showSetAlt, assetUpdated, assetRemoved, idChanged }" />
+
                 </template>
             </div>
         </uploader>
@@ -192,6 +195,12 @@ export default {
     mixins: [Fieldtype],
 
 
+    props: {
+        assetTileComponent: { type: [String, Object], default: 'asset-tile' },
+        assetRowComponent: { type: [String, Object], default: 'asset-row' },
+    },
+
+
     data() {
         return {
             assets: [],