diff --git a/frontend/app/features/content/shared/assets-editor.component.html b/frontend/app/features/content/shared/assets-editor.component.html
index f4bb6a22f..2a8fe76c6 100644
--- a/frontend/app/features/content/shared/assets-editor.component.html
+++ b/frontend/app/features/content/shared/assets-editor.component.html
@@ -20,46 +20,18 @@
     </div>
 
     <div class="body">
-        <ng-container *ngIf="!snapshot.isListView; else listTemplate">
-            <div class="row no-gutters">
-                <sqx-asset *ngFor="let file of snapshot.assetFiles" [assetFile]="file" 
-                    (loadError)="removeLoadingAsset(file)"
-                    (load)="addAsset(file, $event)">
-                </sqx-asset>
-                <sqx-asset *ngFor="let asset of snapshot.assets; trackBy: trackByAsset" [asset]="asset" [isCompact]="isCompact" removeMode="true"
-                    (update)="notifyOthers(asset)"
-                    (remove)="removeLoadedAsset(asset)">
-                </sqx-asset>
-            </div>
-        </ng-container>
-    
-        <ng-template #listTemplate>
-            <div class="list-view">
-                <sqx-asset *ngFor="let file of snapshot.assetFiles" [assetFile]="file"
-                    [isListView]="true" 
-                    (loadError)="removeLoadingAsset(file)"
-                    (load)="addAsset(file, $event)">
-                </sqx-asset>
-                
-                <div
-                    cdkDropList
-                    [cdkDropListDisabled]="snapshot.isDisabled"
-                    [cdkDropListData]="snapshot.assets"
-                    (cdkDropListDropped)="sortAssets($event)">
-                    <div *ngFor="let asset of snapshot.assets; trackBy: trackByAsset"
-                        class="table-drag"
-                        cdkDrag
-                        cdkDragLockAxis="y">
-                        <sqx-asset [asset]="asset" removeMode="true" 
-                            [isListView]="true"
-                            [isCompact]="isCompact"
-                            (update)="notifyOthers(asset)"
-                            (remove)="removeLoadedAsset(asset)">
-                        </sqx-asset>
-                    </div>
-                </div>
-            </div>
-        </ng-template>
+        <div class="row no-gutters" [class.unrow]="snapshot.isListView">
+            <sqx-asset *ngFor="let file of snapshot.assetFiles" [assetFile]="file" 
+                (loadError)="removeLoadingAsset(file)"
+                (load)="addAsset(file, $event)">
+            </sqx-asset>
+            <sqx-asset *ngFor="let asset of snapshot.assets; trackBy: trackByAsset" [asset]="asset" 
+                [isCompact]="isCompact" removeMode="true"
+                [isListView]="snapshot.isListView"
+                (update)="notifyOthers(asset)"
+                (remove)="removeLoadedAsset(asset)">
+            </sqx-asset>
+        </div>
     </div>
 </div>
 
diff --git a/frontend/app/features/content/shared/assets-editor.component.scss b/frontend/app/features/content/shared/assets-editor.component.scss
index 866d10863..1ba9e507b 100644
--- a/frontend/app/features/content/shared/assets-editor.component.scss
+++ b/frontend/app/features/content/shared/assets-editor.component.scss
@@ -22,11 +22,6 @@
     margin-bottom: 1rem;
 }
 
-.list {
-    margin-left: 8px;
-    margin-right: 8px;
-}
-
 .body {
     margin-bottom: -.25rem;
     margin-top: 1rem;
@@ -35,9 +30,6 @@
 
 .unrow {
     display: block;
-    padding-left: 8px;
-    padding-right: 8px;
-    margin: 0;
 }
 
 .drop-area {
@@ -70,11 +62,6 @@
     }
 }
 
-.row {
-    margin-left: -.5rem;
-    margin-right: -.5rem;
-}
-
 .col-4 {
     padding-left: .5rem;
     padding-right: .5rem;
diff --git a/frontend/app/shared/components/assets-list.component.html b/frontend/app/shared/components/assets-list.component.html
index db84d11fb..f4576152b 100644
--- a/frontend/app/shared/components/assets-list.component.html
+++ b/frontend/app/shared/components/assets-list.component.html
@@ -25,7 +25,7 @@
                 <div class="row no-gutters">
                     <div class="folder-container" *ngIf="state.parentFolder | async; let parent"
                         cdkDropList
-                        [cdkDropListData]="parent.id"
+                        [cdkDropListData]="parent?.id"
                         (cdkDropListDropped)="move($event)">
                         <div class="folder-container-over"></div>