diff --git a/test/e2e-test-application/e2e/tests/1-angular/luigi-client-link-manager-features.spec.js b/test/e2e-test-application/e2e/tests/1-angular/luigi-client-link-manager-features.spec.js
index 877b7009ff..dba7187b43 100644
--- a/test/e2e-test-application/e2e/tests/1-angular/luigi-client-link-manager-features.spec.js
+++ b/test/e2e-test-application/e2e/tests/1-angular/luigi-client-link-manager-features.spec.js
@@ -158,6 +158,28 @@ describe('Luigi client linkManager', () => {
       });
     });
 
+    it('navigate with preserve view and goBack dynamic context', localRetries, () => {
+      //navigate with preserve view functionality
+      cy.wrap($iframeBody)
+        .contains('with preserved view: to dynamic node and go back')
+        .click();
+      cy.expectPathToBe('/projects/pr1/users/groups/test1/settings');
+
+      cy.getIframeBody().then($iframeBody => {
+        cy.wrap($iframeBody)
+          .contains('projects/pr1/users/groups/test2/settings')
+          .click();
+        cy.expectPathToBe('/projects/pr1/users/groups/test2/settings');
+
+        cy.getIframeBody().then($iframeBody => {
+          cy.wrap($iframeBody)
+            .contains('Go Back')
+            .click();
+          cy.expectPathToBe('/projects/pr1/users/groups/test1/settings');
+        });
+      });
+    });
+
     it('path exists check', localRetries, () => {
       [
         // non-existent relative path
diff --git a/test/e2e-test-application/src/app/project/project.component.html b/test/e2e-test-application/src/app/project/project.component.html
index f3fbe1619f..8ddf78edf3 100644
--- a/test/e2e-test-application/src/app/project/project.component.html
+++ b/test/e2e-test-application/src/app/project/project.component.html
@@ -400,6 +400,18 @@ <h3 class="fd-layout-panel__title">Navigate</h3>
               data="linkManager().navigate('/settings', null, true)"
             ></app-code-snippet>
           </li>
+          <li class="fd-list__item">
+            <a
+              href="javascript:void(0)"
+              class="fd-link"
+              (click)="navigatePreservedViewGoBack()"
+            >
+              with preserved view: to dynamic node and go back
+            </a>
+            <app-code-snippet
+              data="linkManager().navigate('/projects/pr1/users/groups/test1/settings', null, true);"
+            ></app-code-snippet>
+          </li>
           <li class="fd-list__item">
             <a
               href="javascript:void(0)"
diff --git a/test/e2e-test-application/src/app/project/project.component.ts b/test/e2e-test-application/src/app/project/project.component.ts
index ab1cfe73a3..8d29a5f3b4 100644
--- a/test/e2e-test-application/src/app/project/project.component.ts
+++ b/test/e2e-test-application/src/app/project/project.component.ts
@@ -75,6 +75,10 @@ export class ProjectComponent implements OnInit, OnDestroy {
     }, 2000);
   }
 
+  navigatePreservedViewGoBack() {
+    linkManager().navigate('/projects/pr1/users/groups/test1/settings', null, true);
+  }
+
   navigateWithSync(path) {
     linkManager()['options'].withoutSync = false;
     linkManager().navigate(path);
@@ -206,7 +210,7 @@ export class ProjectComponent implements OnInit, OnDestroy {
 
     uxManager()
       .showAlert(settings)
-      .then((data) => {
+      .then(data => {
         if (typeof data === 'string' && data.includes('neverShowItAgain')) {
           this.alertDismissKey = true;
         }
diff --git a/test/e2e-test-application/src/app/project/users/groups/group-details/group-settings/group-settings.component.html b/test/e2e-test-application/src/app/project/users/groups/group-details/group-settings/group-settings.component.html
index 30788d532b..752f4f110b 100644
--- a/test/e2e-test-application/src/app/project/users/groups/group-details/group-settings/group-settings.component.html
+++ b/test/e2e-test-application/src/app/project/users/groups/group-details/group-settings/group-settings.component.html
@@ -31,7 +31,26 @@ <h3 class="fd-section__title">Group Settings</h3>
         projects/pr2/users/groups/others/settings/dyn1
       </div>
       <br />
-
+      <div
+        class="clickable"
+        (click)="
+        linkManager().navigate(
+          '/projects/pr1/users/groups/test2/settings', null, true
+        )
+      "
+      >
+        projects/pr1/users/groups/test2/settings
+      </div>
+      <br />
+      <div
+        class="clickable"
+        (click)="
+        linkManager().goBack()
+      "
+      >
+        <b>Go Back</b>
+      </div>
+      <br />
       <a
         class="fd-link clickable"
         (click)="