diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
index fc37496b9..6935a3a73 100644
--- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
+++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
@@ -123,13 +123,13 @@
 							</ng-container>
 						</div>
 
-						<div *ngIf="dmp.dois" class="doi-panel">
+						<div *ngIf="dmp.dois && selectedModel" class="doi-panel">
 							<span class="ml-3 mr-3">{{selectedModel.doi}}</span>
 							<div class="d-flex justify-content-end ml-3">
 								<button (click)="copyDoi(dmp.dois[0].doi)" mat-mini-fab class="mr-2 d-flex justify-content-center align-items-center" matTooltip="{{'DMP-LISTING.ACTIONS.COPY' | translate}}" matTooltipPosition="above">
 									<mat-icon class="mat-mini-fab-icon">content_copy</mat-icon>
 								</button>
-								<button mat-mini-fab class="mr-2 d-flex justify-content-center align-items-center" matTooltip="{{'GRANT-EDITOR.ACTIONS.VISIT-WEBSITE' | translate}}" matTooltipPosition="above">
+								<button *ngIf="depositRepos" mat-mini-fab class="mr-2 d-flex justify-content-center align-items-center" matTooltip="{{'GRANT-EDITOR.ACTIONS.VISIT-WEBSITE' | translate}}" matTooltipPosition="above">
 									<a [href]="createDoiLink(dmp.dois[0])" class="doi-link" target="_blank">
 										<mat-icon class="mat-mini-fab-icon">launch</mat-icon>
 									</a>
diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
index 91b68dbcb..e84a61318 100644
--- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
@@ -509,6 +509,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
 	afterDeposit(result: DoiModel[]) {
 		if (result.length > 0) {
 			this.dmp.dois.push(...result);
+			this.selectedModel = this.dmp.dois[this.dmp.dois.length - 1];
 			this.hasDOIToken = true;
 		}
 	}
@@ -642,7 +643,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
 
 	selectDoi(doiModel: DoiModel){
 		this.selectedModel = doiModel;
-		const foundIdx = this.dmp.dois.findIndex(el => el == doiModel);
+		const foundIdx = this.dmp.dois.findIndex(el => el.id == doiModel.id);
 		this.dmp.dois.splice(foundIdx, 1);
 		this.dmp.dois.unshift(doiModel);
 	}