diff --git a/client/src/app/shared/components/head-bar/head-bar.component.html b/client/src/app/shared/components/head-bar/head-bar.component.html
index 9109cc283..087cdd31e 100644
--- a/client/src/app/shared/components/head-bar/head-bar.component.html
+++ b/client/src/app/shared/components/head-bar/head-bar.component.html
@@ -7,12 +7,12 @@
 <mat-toolbar color="primary" [ngClass]="multiSelectMode ? 'multi-select' : ''" class="sticky-toolbar">
     <div class="toolbar-left">
         <!-- Nav menu -->
-        <button mat-icon-button *ngIf="vp.isMobile && !showBackButton" (click)="clickHamburgerMenu()">
+        <button mat-icon-button *ngIf="vp.isMobile && !showBackButton && !editMode" (click)="clickHamburgerMenu()">
             <mat-icon>menu</mat-icon>
         </button>
 
         <!-- Exit / Back button -->
-        <button mat-icon-button *ngIf="showBackButton" (click)="onBackButton()">
+        <button mat-icon-button *ngIf="showBackButton && !editMode" (click)="onBackButton()">
             <mat-icon>arrow_back</mat-icon>
         </button>
 
diff --git a/client/src/app/shared/components/head-bar/head-bar.component.ts b/client/src/app/shared/components/head-bar/head-bar.component.ts
index 6c3fd4944..4011cb75d 100644
--- a/client/src/app/shared/components/head-bar/head-bar.component.ts
+++ b/client/src/app/shared/components/head-bar/head-bar.component.ts
@@ -112,7 +112,7 @@ export class HeadBarComponent {
     public saveEvent = new EventEmitter<boolean>();
 
     public get showBackButton(): boolean {
-        return !this.nav && !this.editMode && !this.multiSelectMode && this.routingState.isSafePrevUrl;
+        return !this.nav && !this.multiSelectMode && (this.routingState.isSafePrevUrl || !this.goBack);
     }
 
     /**