diff --git a/packages/admin-ui/src/lib/core/src/shared/components/asset-gallery/asset-gallery.component.html b/packages/admin-ui/src/lib/core/src/shared/components/asset-gallery/asset-gallery.component.html
index 14e3ea65ab..3cb7db6e21 100644
--- a/packages/admin-ui/src/lib/core/src/shared/components/asset-gallery/asset-gallery.component.html
+++ b/packages/admin-ui/src/lib/core/src/shared/components/asset-gallery/asset-gallery.component.html
@@ -46,7 +46,7 @@
                 >
             </ng-container>
             <div *ngIf="selectionManager.selection.length === 1">
-                <a [routerLink]="['./', lastSelected().id]" class="button-ghost">
+                <a [routerLink]="['/catalog/assets/', lastSelected().id]" (click)="editAssetClick.emit()" class="button-ghost">
                     <clr-icon shape="pencil"></clr-icon> {{ 'common.edit' | translate }}
                     <clr-icon shape="arrow right"></clr-icon>
                 </a>
diff --git a/packages/admin-ui/src/lib/core/src/shared/components/asset-gallery/asset-gallery.component.ts b/packages/admin-ui/src/lib/core/src/shared/components/asset-gallery/asset-gallery.component.ts
index cd96017118..a08f6446cb 100644
--- a/packages/admin-ui/src/lib/core/src/shared/components/asset-gallery/asset-gallery.component.ts
+++ b/packages/admin-ui/src/lib/core/src/shared/components/asset-gallery/asset-gallery.component.ts
@@ -1,4 +1,12 @@
-import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
+import {
+    ChangeDetectionStrategy,
+    Component,
+    EventEmitter,
+    Input,
+    OnChanges,
+    Output,
+    SimpleChanges,
+} from '@angular/core';
 
 import { SelectionManager } from '../../../common/utilities/selection-manager';
 import { ModalService } from '../../../providers/modal/modal.service';
@@ -21,6 +29,7 @@ export class AssetGalleryComponent implements OnChanges {
     @Input() canDelete = false;
     @Output() selectionChange = new EventEmitter<AssetLike[]>();
     @Output() deleteAssets = new EventEmitter<AssetLike[]>();
+    @Output() editAssetClick = new EventEmitter<void>();
 
     selectionManager = new SelectionManager<AssetLike>({
         multiSelect: this.multiSelect,
diff --git a/packages/admin-ui/src/lib/core/src/shared/components/asset-picker-dialog/asset-picker-dialog.component.html b/packages/admin-ui/src/lib/core/src/shared/components/asset-picker-dialog/asset-picker-dialog.component.html
index c850161cb6..735d802d56 100644
--- a/packages/admin-ui/src/lib/core/src/shared/components/asset-picker-dialog/asset-picker-dialog.component.html
+++ b/packages/admin-ui/src/lib/core/src/shared/components/asset-picker-dialog/asset-picker-dialog.component.html
@@ -21,6 +21,7 @@
     [assets]="(assets$ | async)! | paginate: paginationConfig"
     [multiSelect]="multiSelect"
     (selectionChange)="selection = $event"
+    (editAssetClick)="cancel()"
     #assetGalleryComponent
 ></vdr-asset-gallery>