diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index db12170f1a..396fcb1da4 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -2,6 +2,9 @@
 ### Version 6.16.0-follow-up-on-query-tab-v2
 **EUI-8608** Query management follow up on the query tab
 
+### Version 6.16.0-query-management-navigate-back-to-query-list
+**EUI-8693** Query management navigate back to query list from query details
+
 ### Version 6.19.13-case-flags-v2-update-flag-show-other-description
 **EUI-9016** Amend display of page title and field labels on "Update flag" page, to include the flag description for flags of type "Other"
 
diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/query-management/components/query-details/query-details.component.html b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/query-management/components/query-details/query-details.component.html
index ca0cb79ca0..38cbfc869f 100644
--- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/query-management/components/query-details/query-details.component.html
+++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/query-management/components/query-details/query-details.component.html
@@ -1,4 +1,7 @@
 <ng-container *ngIf="query">
+  <p>
+    <a class="govuk-link" href="javascript:void(0)" (click)="onBack()">{{ 'Back to query list' | rpxTranslate }}</a>
+  </p>
   <div>
     <table class="govuk-table query-details-table" [attr.aria-describedby]="'Details of the query' | rpxTranslate">
       <caption class="govuk-table__caption govuk-table__caption--l">
diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/query-management/components/query-details/query-details.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/query-management/components/query-details/query-details.component.spec.ts
index 27a5cd9151..8cf7fa8760 100644
--- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/query-management/components/query-details/query-details.component.spec.ts
+++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/query-management/components/query-details/query-details.component.spec.ts
@@ -137,7 +137,7 @@ describe('QueryDetailsComponent', () => {
     expect(component).toBeTruthy();
   });
 
-  it('should emit event on clcking back to queries', () => {
+  it('should emit event on clcking back to query list', () => {
     spyOn(component.backClicked, 'emit');
     component.onBack();
     expect(component.backClicked.emit).toHaveBeenCalled();
diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/query-management/read-query-management-field.component.html b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/query-management/read-query-management-field.component.html
index e0d800d2bb..6075eec0f5 100644
--- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/query-management/read-query-management-field.component.html
+++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/query-management/read-query-management-field.component.html
@@ -8,10 +8,6 @@
 
 <ng-template #singleQueryDetails>
   <br>
-  <p>
-    <a class="govuk-link" href="javascript:void(0)">{{ 'Back to queries' | rpxTranslate }}</a>
-  </p>
-
   <ccd-query-details
     [query]="query"
     (backClicked)="showQueryList = true"