From 15996338ff1a47c538bf5806a4f0784c8013762b Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Mon, 25 Aug 2025 11:35:07 +0200
Subject: [PATCH 1/6] 133535: Navigate to a non-existing ID to prevent the
 browser from scrolling

Fix scroll position being lost in selected relationships & imported from external sources tabs

133535: Minor fixes for cleaner diff

133535: fix specs

133535: add scroll-service to specs

133535: add top margin on the submission forms

133535: fix clear pagination

133535: Small fixes

133535: retainScrollPosition for search facet filters & labels

133535: add retainScrollPosition to view-mode-switch.component

133535: use retainScrollPosition for search-switch-configuration.component

133535: use retainScrollPosition for search-filters

133535: preserveFragment when filter reset

133535: fragment in pagination state

133535: do not override input value in themed wrapper

133535: add comments

133535: fix flaky search-form.component specs

133535: fix cannot read ".page" of undefined

133535: keep fragment wen changing page

133535: add fragment to query search

133535: add retainScrollPosition to RPP

133535: add fragment to facetValue

133535: add retainScrollPosition to search components for sort order

133535: add retainScrollPosition to search components

133535: Prevent opening and closing of relationship modal from resetting the scroll position
---
 .../pagination/pagination.service.spec.ts     | 10 +++--
 src/app/core/pagination/pagination.service.ts | 41 +++++++++++++------
 src/app/core/scroll/scroll.service.ts         | 38 +++++++++++++++++
 .../core/shared/search/search.service.spec.ts | 14 ++++++-
 src/app/core/shared/search/search.service.ts  |  4 +-
 ...namic-lookup-relation-modal.component.html |  3 ++
 ...dynamic-lookup-relation-modal.component.ts | 27 ++++++------
 ...elation-external-source-tab.component.html |  4 +-
 ...-relation-external-source-tab.component.ts |  7 ++++
 ...l-source-entry-import-modal.component.html |  1 +
 ...nal-source-entry-import-modal.component.ts | 17 +++++---
 ...-relation-external-source-tab.component.ts | 16 +++++++-
 ...-lookup-relation-search-tab.component.html |  1 +
 ...ic-lookup-relation-search-tab.component.ts |  7 +++-
 ...ic-lookup-relation-search-tab.component.ts |  6 ++-
 ...okup-relation-selection-tab.component.html |  3 +-
 ...lookup-relation-selection-tab.component.ts |  7 +++-
 .../object-collection.component.html          |  1 +
 .../object-collection.component.ts            |  5 +++
 .../object-list/object-list.component.html    |  1 +
 .../object-list/object-list.component.ts      |  5 +++
 .../themed-object-list.component.ts           |  6 +++
 .../page-size-selector.component.ts           | 10 ++++-
 .../search-form/search-form.component.spec.ts | 30 ++++++++------
 .../search-form/search-form.component.ts      | 10 +++--
 .../themed-search-form.component.ts           |  3 ++
 .../search-authority-filter.component.html    |  4 +-
 .../search-boolean-filter.component.html      |  4 +-
 .../search-facet-option.component.html        |  1 +
 .../search-facet-option.component.ts          |  5 +++
 .../search-facet-range-option.component.html  |  1 +
 .../search-facet-range-option.component.ts    |  5 +++
 ...earch-facet-selected-option.component.html |  1 +
 .../search-facet-selected-option.component.ts |  5 +++
 .../search-facet-filter-wrapper.component.ts  |  9 +++-
 .../search-facet-filter.component.spec.ts     | 13 +++++-
 .../search-facet-filter.component.ts          | 22 +++++-----
 .../search-filter.component.html              |  3 +-
 .../search-filter/search-filter.component.ts  |  5 +++
 .../search-hierarchy-filter.component.html    |  4 +-
 .../search-hierarchy-filter.component.spec.ts |  7 +++-
 .../search-hierarchy-filter.component.ts      | 21 ++++------
 .../search-range-filter.component.html        |  2 +-
 .../search-range-filter.component.spec.ts     | 11 +++--
 .../search-range-filter.component.ts          | 17 ++++----
 .../search-text-filter.component.html         |  4 +-
 .../search-filters.component.html             |  4 +-
 .../search-filters.component.ts               |  5 +++
 .../themed-search-filters.component.ts        |  9 +++-
 .../search-label/search-label.component.html  |  1 +
 .../search-label/search-label.component.ts    |  1 +
 .../search-labels.component.html              |  2 +-
 .../search-labels/search-labels.component.ts  |  5 +++
 .../search-results.component.html             |  1 +
 .../search-results.component.ts               |  5 +++
 .../themed-search-results.component.ts        |  4 +-
 .../search-settings.component.html            |  2 +-
 .../search-settings.component.ts              |  8 +++-
 .../themed-search-settings.component.ts       |  3 +-
 .../search-sidebar.component.html             |  9 ++--
 .../search-sidebar.component.ts               |  5 +++
 .../themed-search-sidebar.component.ts        |  5 ++-
 ...rch-switch-configuration.component.spec.ts |  1 +
 .../search-switch-configuration.component.ts  |  5 +++
 src/app/shared/search/search.component.html   |  6 ++-
 src/app/shared/search/search.component.ts     |  5 +++
 .../shared/search/themed-search.component.ts  |  4 +-
 .../sidebar/page-with-sidebar.component.ts    |  3 ++
 src/app/shared/testing/router.stub.ts         |  2 +-
 src/app/shared/testing/scroll-service.stub.ts | 10 +++++
 .../view-mode-switch.component.ts             |  7 +++-
 71 files changed, 403 insertions(+), 130 deletions(-)
 create mode 100644 src/app/core/scroll/scroll.service.ts
 create mode 100644 src/app/shared/testing/scroll-service.stub.ts

diff --git a/src/app/core/pagination/pagination.service.spec.ts b/src/app/core/pagination/pagination.service.spec.ts
index da508d45cda..e19db1fc0a8 100644
--- a/src/app/core/pagination/pagination.service.spec.ts
+++ b/src/app/core/pagination/pagination.service.spec.ts
@@ -4,12 +4,15 @@ import { of as observableOf } from 'rxjs';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { SortDirection, SortOptions } from '../cache/models/sort-options.model';
 import { FindListOptions } from '../data/find-list-options.model';
+import { ScrollService } from '../scroll/scroll.service';
+import { ScrollServiceStub } from '../../shared/testing/scroll-service.stub';
 
 
 describe('PaginationService', () => {
   let service: PaginationService;
   let router;
   let routeService;
+  let scrollService: ScrollService;
 
   const defaultPagination = new PaginationComponentOptions();
   const defaultSort = new SortOptions('dc.title', SortDirection.ASC);
@@ -35,8 +38,9 @@ describe('PaginationService', () => {
         return observableOf(value);
       }
     };
+    scrollService = new ScrollServiceStub() as any;
 
-    service = new PaginationService(routeService, router);
+    service = new PaginationService(routeService, router, scrollService);
   });
 
   describe('getCurrentPagination', () => {
@@ -69,7 +73,7 @@ describe('PaginationService', () => {
           return observableOf(value);
         }
       };
-      service = new PaginationService(routeService, router);
+      service = new PaginationService(routeService, router, scrollService);
 
       service.getCurrentSort('test-id', defaultSort).subscribe((currentSort) => {
         expect(currentSort).toEqual(defaultSort);
@@ -93,7 +97,7 @@ describe('PaginationService', () => {
       spyOn(service, 'updateRoute');
       service.resetPage('test');
 
-      expect(service.updateRoute).toHaveBeenCalledWith('test', {page: 1});
+      expect(service.updateRoute).toHaveBeenCalledWith('test', {page: 1}, undefined, undefined);
     });
   });
 
diff --git a/src/app/core/pagination/pagination.service.ts b/src/app/core/pagination/pagination.service.ts
index ce4c3adc3c8..e92a58ffdc5 100644
--- a/src/app/core/pagination/pagination.service.ts
+++ b/src/app/core/pagination/pagination.service.ts
@@ -1,14 +1,17 @@
-import { Injectable } from '@angular/core';
+import { Injectable, InjectionToken } from '@angular/core';
 import { NavigationExtras, Router } from '@angular/router';
 import { RouteService } from '../services/route.service';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
+import { combineLatest as observableCombineLatest, Observable, BehaviorSubject } from 'rxjs';
 import { filter, map, take } from 'rxjs/operators';
 import { SortDirection, SortOptions } from '../cache/models/sort-options.model';
 import { hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util';
 import { difference } from '../../shared/object.util';
 import { FindListOptions } from '../data/find-list-options.model';
 import { isNumeric } from '../../shared/numeric.util';
+import { ScrollService } from '../scroll/scroll.service';
+
+export const RETAIN_SCROLL_POSITION: InjectionToken<BehaviorSubject<any>> = new InjectionToken<boolean>('retainScrollPosition');
 
 @Injectable({
   providedIn: 'root',
@@ -33,7 +36,8 @@ export class PaginationService {
   private clearParams = {};
 
   constructor(protected routeService: RouteService,
-              protected router: Router
+              protected router: Router,
+              protected scrollService: ScrollService,
   ) {
   }
 
@@ -105,9 +109,10 @@ export class PaginationService {
   /**
    * Reset the current page for the provided pagination ID to 1.
    * @param paginationId - The pagination id for which to reset the page
+   * @param retainScrollPosition - Scroll to the pagination component after updating the route instead of the top of the page
    */
-  resetPage(paginationId: string) {
-    this.updateRoute(paginationId, {page: 1});
+  resetPage(paginationId: string, retainScrollPosition?: boolean): void {
+    this.updateRoute(paginationId, { page: 1 }, undefined, retainScrollPosition);
   }
 
 
@@ -141,7 +146,7 @@ export class PaginationService {
    * @param url - The url to navigate to
    * @param params - The page related params to update in the route
    * @param extraParams - Addition params unrelated to the pagination that need to be added to the route
-   * @param retainScrollPosition - Scroll to the pagination component after updating the route instead of the top of the page
+   * @param retainScrollPosition - Scroll to the active fragment after updating the route instead of the top of the page
    * @param navigationExtras - Extra parameters to pass on to `router.navigate`. Can be used to override values set by this service.
    */
   updateRouteWithUrl(
@@ -161,16 +166,26 @@ export class PaginationService {
       const currentParametersWithIdName = this.getParametersWithIdName(paginationId, currentFindListOptions);
       const parametersWithIdName = this.getParametersWithIdName(paginationId, params);
       if (isNotEmpty(difference(parametersWithIdName, currentParametersWithIdName)) || isNotEmpty(extraParams) || isNotEmpty(this.clearParams)) {
-        const queryParams = Object.assign({}, this.clearParams, currentParametersWithIdName,
-          parametersWithIdName, extraParams);
+        const queryParams = Object.assign({}, currentParametersWithIdName,
+          parametersWithIdName, extraParams, this.clearParams);
         if (retainScrollPosition) {
+          // By navigating to a non-existing ID, like "prevent-scroll", the browser won't perform any scroll operations
+          const fragment: string = this.scrollService.activeFragment ?? 'prevent-scroll';
+          this.scrollService.setFragment(fragment);
           this.router.navigate(url, {
             queryParams: queryParams,
             queryParamsHandling: 'merge',
-            fragment: `p-${paginationId}`,
+            fragment: fragment,
             ...navigationExtras,
+          }).then((success: boolean) => {
+            setTimeout(() => {
+              if (success) {
+                this.scrollService.scrollToActiveFragment();
+              }
+            });
           });
         } else {
+          this.scrollService.setFragment(null);
           this.router.navigate(url, {
             queryParams: queryParams,
             queryParamsHandling: 'merge',
@@ -226,16 +241,16 @@ export class PaginationService {
     sortDirection?: SortDirection
   }) {
     const paramsWithIdName = {};
-    if (hasValue(params.page)) {
+    if (hasValue(params?.page)) {
       paramsWithIdName[`${paginationId}.page`] = `${params.page}`;
     }
-    if (hasValue(params.pageSize)) {
+    if (hasValue(params?.pageSize)) {
       paramsWithIdName[`${paginationId}.rpp`] = `${params.pageSize}`;
     }
-    if (hasValue(params.sortField)) {
+    if (hasValue(params?.sortField)) {
       paramsWithIdName[`${paginationId}.sf`] = `${params.sortField}`;
     }
-    if (hasValue(params.sortDirection)) {
+    if (hasValue(params?.sortDirection)) {
       paramsWithIdName[`${paginationId}.sd`] = `${params.sortDirection}`;
     }
     return paramsWithIdName;
diff --git a/src/app/core/scroll/scroll.service.ts b/src/app/core/scroll/scroll.service.ts
new file mode 100644
index 00000000000..96eaf7388ff
--- /dev/null
+++ b/src/app/core/scroll/scroll.service.ts
@@ -0,0 +1,38 @@
+import { Inject, Injectable } from '@angular/core';
+import { DOCUMENT } from '@angular/common';
+
+/**
+ * Service used to scroll to a specific fragment/ID on the page
+ */
+@Injectable({
+  providedIn: 'root',
+})
+export class ScrollService {
+
+  activeFragment: string | null = null;
+
+  constructor(
+    @Inject(DOCUMENT) protected document: Document,
+  ) {
+  }
+
+  /**
+   * Sets the fragment/ID that the user should jump to when the route is refreshed
+   *
+   * @param fragment The fragment/ID
+   */
+  setFragment(fragment: string): void {
+    this.activeFragment = fragment;
+  }
+
+  /**
+   * Scrolls to the active fragment/ID if it exists
+   */
+  scrollToActiveFragment(): void {
+    if (this.activeFragment) {
+      this.document.getElementById(this.activeFragment)?.scrollIntoView({
+        block: 'start',
+      });
+    }
+  }
+}
diff --git a/src/app/core/shared/search/search.service.spec.ts b/src/app/core/shared/search/search.service.spec.ts
index fe5b495ab0c..c6746cc5119 100644
--- a/src/app/core/shared/search/search.service.spec.ts
+++ b/src/app/core/shared/search/search.service.spec.ts
@@ -141,13 +141,23 @@ describe('SearchService', () => {
 
     it('should call the navigate method on the Router with view mode list parameter as a parameter when setViewMode is called', () => {
       searchService.setViewMode(ViewMode.ListElement);
-      expect(paginationService.updateRouteWithUrl).toHaveBeenCalledWith('page-id', ['/search'], { page: 1 }, { view: ViewMode.ListElement }
+      expect(paginationService.updateRouteWithUrl).toHaveBeenCalledWith(
+        'page-id',
+        ['/search'],
+        { page: 1 },
+        { view: ViewMode.ListElement },
+        undefined,
       );
     });
 
     it('should call the navigate method on the Router with view mode grid parameter as a parameter when setViewMode is called', () => {
       searchService.setViewMode(ViewMode.GridElement);
-      expect(paginationService.updateRouteWithUrl).toHaveBeenCalledWith('page-id', ['/search'], { page: 1 }, { view: ViewMode.GridElement }
+      expect(paginationService.updateRouteWithUrl).toHaveBeenCalledWith(
+        'page-id',
+        ['/search'],
+        { page: 1 },
+        { view: ViewMode.GridElement },
+        undefined,
       );
     });
 
diff --git a/src/app/core/shared/search/search.service.ts b/src/app/core/shared/search/search.service.ts
index a88a8b0d16b..f7851ef3697 100644
--- a/src/app/core/shared/search/search.service.ts
+++ b/src/app/core/shared/search/search.service.ts
@@ -315,7 +315,7 @@ export class SearchService implements OnDestroy {
    * @param {ViewMode} viewMode Mode to switch to
    * @param {string[]} searchLinkParts
    */
-  setViewMode(viewMode: ViewMode, searchLinkParts?: string[]) {
+  setViewMode(viewMode: ViewMode, searchLinkParts?: string[], retainScrollPosition?: boolean) {
     this.paginationService.getCurrentPagination(this.searchConfigurationService.paginationID, new PaginationComponentOptions()).pipe(take(1))
       .subscribe((config) => {
         let pageParams = { page: 1 };
@@ -325,7 +325,7 @@ export class SearchService implements OnDestroy {
         } else if (config.pageSize === 1) {
           pageParams = Object.assign(pageParams, { pageSize: 10 });
         }
-        this.paginationService.updateRouteWithUrl(this.searchConfigurationService.paginationID, hasValue(searchLinkParts) ? searchLinkParts : [this.getSearchLink()], pageParams, queryParams);
+        this.paginationService.updateRouteWithUrl(this.searchConfigurationService.paginationID, hasValue(searchLinkParts) ? searchLinkParts : [this.getSearchLink()], pageParams, queryParams, retainScrollPosition);
       });
   }
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
index b72a8722aec..0a2e6d1bf04 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
@@ -24,6 +24,7 @@ <h4 class="modal-title" id="modal-title">{{ ('submission.sections.describe.relat
                             [item]="item"
                             [isEditRelationship]="isEditRelationship"
                             [toRemove]="toRemove"
+                            [retainScrollPosition]="true"
                             (selectObject)="select($event)"
                             (deselectObject)="deselect($event)"
                             (resultFound)="setTotalInternals($event.pageInfo.totalElements)"
@@ -43,6 +44,7 @@ <h4 class="modal-title" id="modal-title">{{ ('submission.sections.describe.relat
                             [relationship]="relationshipOptions"
                             [context]="context"
                             [externalSource]="source"
+                            [retainScrollPosition]="true"
                             (importedObject)="imported($event)"
                             class="d-block pt-3">
                     </ds-themed-dynamic-lookup-relation-external-source-tab>
@@ -56,6 +58,7 @@ <h4 class="modal-title" id="modal-title">{{ ('submission.sections.describe.relat
                             [listId]="listId"
                             [relationshipType]="relationshipOptions.relationshipType"
                             [repeatable]="repeatable"
+                            [retainScrollPosition]="true"
                             [context]="context"
                             (selectObject)="select($event)"
                             (deselectObject)="deselect($event)"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
index 446497a74fc..e8d652694ce 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
@@ -24,11 +24,11 @@ import { Context } from '../../../../../core/shared/context.model';
 import { LookupRelationService } from '../../../../../core/data/lookup-relation.service';
 import { ExternalSource } from '../../../../../core/shared/external-source.model';
 import { ExternalSourceDataService } from '../../../../../core/data/external-source-data.service';
-import { Router } from '@angular/router';
 import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
 import { getAllSucceededRemoteDataPayload } from '../../../../../core/shared/operators';
 import { followLink } from '../../../../utils/follow-link-config.model';
 import { RelationshipType } from '../../../../../core/shared/item-relationships/relationship-type.model';
+import { PaginationService } from '../../../../../core/pagination/pagination.service';
 
 @Component({
   selector: 'ds-dynamic-lookup-relation-modal',
@@ -155,16 +155,16 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
 
   constructor(
     public modal: NgbActiveModal,
-    private selectableListService: SelectableListService,
-    private relationshipService: RelationshipDataService,
-    private relationshipTypeService: RelationshipTypeDataService,
-    private externalSourceService: ExternalSourceDataService,
-    private lookupRelationService: LookupRelationService,
-    private searchConfigService: SearchConfigurationService,
-    private rdbService: RemoteDataBuildService,
-    private zone: NgZone,
-    private store: Store<AppState>,
-    private router: Router,
+    protected selectableListService: SelectableListService,
+    protected relationshipService: RelationshipDataService,
+    protected relationshipTypeService: RelationshipTypeDataService,
+    protected externalSourceService: ExternalSourceDataService,
+    protected lookupRelationService: LookupRelationService,
+    protected searchConfigService: SearchConfigurationService,
+    protected rdbService: RemoteDataBuildService,
+    protected zone: NgZone,
+    protected store: Store<AppState>,
+    protected paginationService: PaginationService,
   ) {
 
   }
@@ -298,7 +298,10 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
   }
 
   ngOnDestroy() {
-    this.router.navigate([], {});
+    this.paginationService.clearPagination(this.searchConfigService.paginationID);
+    this.paginationService.updateRoute(this.searchConfigService.paginationID, undefined, undefined, true, {
+      queryParamsHandling: '',
+    });
     Object.values(this.subMap).forEach((subscription) => subscription.unsubscribe());
   }
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html
index cf8cb565778..92e04027264 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html
@@ -1,11 +1,12 @@
 <div class="row">
   <div class="col-4">
     <h3>{{ 'submission.sections.describe.relationship-lookup.selection-tab.settings' | translate}}</h3>
-    <ds-page-size-selector></ds-page-size-selector>
+    <ds-page-size-selector [retainScrollPosition]="retainScrollPosition"></ds-page-size-selector>
   </div>
   <div class="col-8">
     <ds-themed-search-form [query]="(searchConfigService.paginatedSearchOptions | async)?.query"
                     [inPlaceSearch]="true"
+                    [retainScrollPosition]="retainScrollPosition"
                     [searchPlaceholder]="'submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder' | translate">
     </ds-themed-search-form>
     <div>
@@ -19,6 +20,7 @@ <h3>{{ 'submission.sections.describe.relationship-lookup.selection-tab.title.' +
                                 [context]="context"
                                 [importable]="true"
                                 [importConfig]="importConfig"
+                                [retainScrollPosition]="retainScrollPosition"
                                 (importObject)="import($event)">
         </ds-viewable-collection>
         <ds-themed-loading *ngIf="!entriesRD || entriesRD?.isLoading"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
index 601bd8cce81..76b97ac6764 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
@@ -76,6 +76,12 @@ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit
    */
   @Input() context: Context;
   @Input() repeatable: boolean;
+
+  /**
+   * Should scroll to the pagination component after updating the route instead of the top of the page
+   */
+  @Input() retainScrollPosition = false;
+
   /**
    * Emit an event when an object has been imported (or selected from similar local entries)
    */
@@ -180,6 +186,7 @@ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit
       modalComp.relationship = this.relationship;
       modalComp.label = this.label;
       modalComp.relatedEntityType = this.relatedEntityType;
+      modalComp.retainScrollPosition = this.retainScrollPosition;
     }));
 
     this.subs.push(modalComp$.pipe(
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html
index 44f21fb4b44..ef108741ac3 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html
@@ -27,6 +27,7 @@ <h5 class="font-weight-bold">{{ (labelPrefix + 'entities' | translate) }}</h5>
                        [selectionConfig]="{ repeatable: false, listId: entityListId }"
                        [linkType]="linkTypes.ExternalLink"
                        [context]="context"
+                       [retainScrollPosition]="retainScrollPosition"
                        (deselectObject)="deselectEntity()"
                        (selectObject)="selectEntity($event)">
     </ds-search-results>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts
index bf1f2f7e70c..93c1d41a8ec 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, OnInit } from '@angular/core';
+import { Component, EventEmitter, OnInit, Input } from '@angular/core';
 import { NgbActiveModal, NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { ExternalSourceEntry } from '../../../../../../../core/shared/external-source-entry.model';
 import { MetadataValue } from '../../../../../../../core/shared/metadata.models';
@@ -57,22 +57,22 @@ export class ExternalSourceEntryImportModalComponent implements OnInit {
   /**
    * The label to use for all messages (added to the end of relevant i18n keys)
    */
-  label: string;
+  @Input() label: string;
 
   /**
    * The external source entry
    */
-  externalSourceEntry: ExternalSourceEntry;
+  @Input() externalSourceEntry: ExternalSourceEntry;
 
   /**
    * The item in submission
    */
-  item: Item;
+  @Input() item: Item;
 
   /**
    * The current relationship-options used for filtering results
    */
-  relationship: RelationshipOptions;
+  @Input() relationship: RelationshipOptions;
 
   /**
    * The metadata value for the entry's uri
@@ -142,7 +142,12 @@ export class ExternalSourceEntryImportModalComponent implements OnInit {
   /**
    * The entity types compatible with the given external source
    */
-  relatedEntityType: ItemType;
+  @Input() relatedEntityType: ItemType;
+
+  /**
+   * Should scroll to the pagination component after updating the route instead of the top of the page
+   */
+  @Input() retainScrollPosition = false;
 
   /**
    * The modal for the collection selection
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/themed-dynamic-lookup-relation-external-source-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/themed-dynamic-lookup-relation-external-source-tab.component.ts
index 637941ce5bf..1cc0ce88166 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/themed-dynamic-lookup-relation-external-source-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/themed-dynamic-lookup-relation-external-source-tab.component.ts
@@ -14,8 +14,18 @@ import { DsDynamicLookupRelationExternalSourceTabComponent } from './dynamic-loo
   templateUrl: '../../../../../theme-support/themed.component.html',
 })
 export class ThemedDynamicLookupRelationExternalSourceTabComponent extends ThemedComponent<DsDynamicLookupRelationExternalSourceTabComponent> {
-  protected inAndOutputNames: (keyof DsDynamicLookupRelationExternalSourceTabComponent & keyof this)[] = ['label', 'listId',
-    'item', 'collection', 'relationship', 'context', 'repeatable', 'importedObject', 'externalSource'];
+  protected inAndOutputNames: (keyof DsDynamicLookupRelationExternalSourceTabComponent & keyof this)[] = [
+    'label',
+    'listId',
+    'item',
+    'collection',
+    'relationship',
+    'context',
+    'repeatable',
+    'importedObject',
+    'externalSource',
+    'retainScrollPosition',
+  ];
 
   @Input() label: string;
 
@@ -31,6 +41,8 @@ export class ThemedDynamicLookupRelationExternalSourceTabComponent extends Theme
 
   @Input() repeatable: boolean;
 
+  @Input() retainScrollPosition: boolean;
+
   @Output() importedObject: EventEmitter<ListableObject> = new EventEmitter();
 
   @Input() externalSource: ExternalSource;
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html
index 17aafae5eb9..23526f55bcd 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html
@@ -10,6 +10,7 @@
            [showScopeSelector]="false"
            [showViewModes]="false"
            [query]="query"
+           [retainScrollPosition]="retainScrollPosition"
            (resultFound)="onResultFound($event)"
            (deselectObject)="deselectObject.emit($event)"
            (selectObject)="selectObject.emit($event)">
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
index 9452918a978..598f72b2708 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
@@ -93,6 +93,11 @@ export class DsDynamicLookupRelationSearchTabComponent implements OnInit, OnDest
    */
   @Input() isEditRelationship: boolean;
 
+  /**
+   * Should scroll to the pagination component after updating the route instead of the top of the page
+   */
+  @Input() retainScrollPosition = false;
+
   /**
    * Send an event to deselect an object from the list
    */
@@ -167,7 +172,7 @@ export class DsDynamicLookupRelationSearchTabComponent implements OnInit, OnDest
    * Method to reset the route when the window is opened to make sure no strange pagination issues appears
    */
   resetRoute() {
-    this.paginationService.updateRoute(this.searchConfigService.paginationID, this.initialPagination);
+    this.paginationService.updateRoute(this.searchConfigService.paginationID, this.initialPagination, undefined, true);
   }
 
   /**
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/themed-dynamic-lookup-relation-search-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/themed-dynamic-lookup-relation-search-tab.component.ts
index d44f8f84a02..00cd2f8e54e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/themed-dynamic-lookup-relation-search-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/themed-dynamic-lookup-relation-search-tab.component.ts
@@ -19,7 +19,9 @@ import { DSpaceObject } from '../../../../../../core/shared/dspace-object.model'
 export class ThemedDynamicLookupRelationSearchTabComponent extends ThemedComponent<DsDynamicLookupRelationSearchTabComponent> {
   protected inAndOutputNames: (keyof DsDynamicLookupRelationSearchTabComponent & keyof this)[] = ['relationship', 'listId',
     'query', 'repeatable', 'selection$', 'context', 'relationshipType', 'item', 'isLeft', 'toRemove', 'isEditRelationship',
-    'deselectObject', 'selectObject', 'resultFound'];
+    'deselectObject', 'selectObject', 'resultFound',
+    'retainScrollPosition',
+  ];
 
   @Input() relationship: RelationshipOptions;
 
@@ -43,6 +45,8 @@ export class ThemedDynamicLookupRelationSearchTabComponent extends ThemedCompone
 
   @Input() isEditRelationship: boolean;
 
+  @Input() retainScrollPosition: boolean;
+
   @Output() deselectObject: EventEmitter<ListableObject> = new EventEmitter();
 
   @Output() selectObject: EventEmitter<ListableObject> = new EventEmitter();
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.html
index 8d0053a1df8..30735020033 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.html
@@ -1,7 +1,7 @@
 <div class="row">
     <div class="col-4">
         <h3>{{ 'submission.sections.describe.relationship-lookup.selection-tab.settings' | translate}}</h3>
-        <ds-page-size-selector></ds-page-size-selector>
+        <ds-page-size-selector [retainScrollPosition]="retainScrollPosition"></ds-page-size-selector>
     </div>
     <div class="col-8">
         <div *ngIf="(selectionRD$ | async)?.payload.page < 1">
@@ -15,6 +15,7 @@ <h3>{{ 'submission.sections.describe.relationship-lookup.selection-tab.title.' +
                                     [config]="(currentPagination$ |async)"
                                     [hideGear]="true"
                                     [context]="context"
+                                    [retainScrollPosition]="retainScrollPosition"
                                     (deselectObject)="deselectObject.emit($event)"
                                     (selectObject)="selectObject.emit($event)"
             ></ds-viewable-collection>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
index a78bf8896c8..49f76e5a63b 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
@@ -45,6 +45,11 @@ export class DsDynamicLookupRelationSelectionTabComponent {
    */
   @Input() repeatable: boolean;
 
+  /**
+   * Should scroll to the pagination component after updating the route instead of the top of the page
+   */
+  @Input() retainScrollPosition = false;
+
   /**
    * The list of selected items
    */
@@ -126,6 +131,6 @@ export class DsDynamicLookupRelationSelectionTabComponent {
     this.paginationService.updateRoute(this.searchConfigService.paginationID, {
       page: 1,
       pageSize: 5
-    });
+    }, undefined, true);
   }
 }
diff --git a/src/app/shared/object-collection/object-collection.component.html b/src/app/shared/object-collection/object-collection.component.html
index 3b0dca80ac7..19836b1e23f 100644
--- a/src/app/shared/object-collection/object-collection.component.html
+++ b/src/app/shared/object-collection/object-collection.component.html
@@ -20,6 +20,7 @@
                 [selectionConfig]="selectionConfig"
                 [importable]="importable"
                 [importConfig]="importConfig"
+                [retainScrollPosition]="retainScrollPosition"
                 (importObject)="importObject.emit($event)"
                 (contentChange)="contentChange.emit($event)"
                 (prev)="goPrev()"
diff --git a/src/app/shared/object-collection/object-collection.component.ts b/src/app/shared/object-collection/object-collection.component.ts
index e1f9182562a..f4d7f93de8b 100644
--- a/src/app/shared/object-collection/object-collection.component.ts
+++ b/src/app/shared/object-collection/object-collection.component.ts
@@ -60,6 +60,11 @@ export class ObjectCollectionComponent implements OnInit {
   @Input() selectable = false;
   @Input() selectionConfig: {repeatable: boolean, listId: string};
 
+  /**
+   * Should scroll to the pagination component after updating the route instead of the top of the page
+   */
+  @Input() retainScrollPosition = false;
+
   /**
    * Emit custom event for listable object custom actions.
    */
diff --git a/src/app/shared/object-list/object-list.component.html b/src/app/shared/object-list/object-list.component.html
index b8712b85c57..909e190a08f 100644
--- a/src/app/shared/object-list/object-list.component.html
+++ b/src/app/shared/object-list/object-list.component.html
@@ -8,6 +8,7 @@
         [hidePagerWhenSinglePage]="hidePagerWhenSinglePage"
         [hidePaginationDetail]="hidePaginationDetail"
         [showPaginator]="showPaginator"
+        [retainScrollPosition]="retainScrollPosition"
         (pageChange)="onPageChange($event)"
         (pageSizeChange)="onPageSizeChange($event)"
         (sortDirectionChange)="onSortDirectionChange($event)"
diff --git a/src/app/shared/object-list/object-list.component.ts b/src/app/shared/object-list/object-list.component.ts
index 5161b754598..25f347b9834 100644
--- a/src/app/shared/object-list/object-list.component.ts
+++ b/src/app/shared/object-list/object-list.component.ts
@@ -86,6 +86,11 @@ export class ObjectListComponent {
    */
   @Input() showThumbnails;
 
+  /**
+   * Should scroll to the pagination component after updating the route instead of the top of the page
+   */
+  @Input() retainScrollPosition = false;
+
   /**
    * Emit when one of the listed object has changed.
    */
diff --git a/src/app/shared/object-list/themed-object-list.component.ts b/src/app/shared/object-list/themed-object-list.component.ts
index 14ddf474ad9..ac51be2ecd3 100644
--- a/src/app/shared/object-list/themed-object-list.component.ts
+++ b/src/app/shared/object-list/themed-object-list.component.ts
@@ -83,6 +83,11 @@ export class ThemedObjectListComponent extends ThemedComponent<ObjectListCompone
    */
   @Input() showThumbnails;
 
+  /**
+   * Should scroll to the pagination component after updating the route instead of the top of the page
+   */
+  @Input() retainScrollPosition: boolean;
+
   /**
    * Emit when one of the listed object has changed.
    */
@@ -175,6 +180,7 @@ export class ThemedObjectListComponent extends ThemedComponent<ObjectListCompone
     'selectObject',
     'importObject',
     'sortFieldChange',
+    'retainScrollPosition',
   ];
 
   protected getComponentName(): string {
diff --git a/src/app/shared/page-size-selector/page-size-selector.component.ts b/src/app/shared/page-size-selector/page-size-selector.component.ts
index 0dce32a4ba8..dd6efe04ce4 100644
--- a/src/app/shared/page-size-selector/page-size-selector.component.ts
+++ b/src/app/shared/page-size-selector/page-size-selector.component.ts
@@ -1,4 +1,4 @@
-import { Component, Inject, OnInit } from '@angular/core';
+import { Component, Inject, OnInit, Input } from '@angular/core';
 import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 import { Observable } from 'rxjs';
 import { ActivatedRoute, Router } from '@angular/router';
@@ -18,6 +18,12 @@ import { PaginationService } from '../../core/pagination/pagination.service';
  * This component represents the part of the search sidebar that contains the page size settings.
  */
 export class PageSizeSelectorComponent implements OnInit {
+
+  /**
+   * Should scroll to the pagination component after updating the route instead of the top of the page
+   */
+  @Input() retainScrollPosition = false;
+
   /**
    * The configuration for the current paginated search results
    */
@@ -46,7 +52,7 @@ export class PageSizeSelectorComponent implements OnInit {
     this.paginationOptions$.pipe(
       take(1)
     ).subscribe((pagination: PaginationComponentOptions) => {
-      this.paginationService.updateRoute(pagination.id, {page: 1, pageSize: +value});
+      this.paginationService.updateRoute(pagination.id, {page: 1, pageSize: +value}, undefined, this.retainScrollPosition);
     }) ;
   }
 }
diff --git a/src/app/shared/search-form/search-form.component.spec.ts b/src/app/shared/search-form/search-form.component.spec.ts
index 584b7c5584c..220f3fef2b5 100644
--- a/src/app/shared/search-form/search-form.component.spec.ts
+++ b/src/app/shared/search-form/search-form.component.spec.ts
@@ -17,6 +17,9 @@ import { BrowserOnlyMockPipe } from '../testing/browser-only-mock.pipe';
 import { SearchServiceStub } from '../testing/search-service.stub';
 import { Router } from '@angular/router';
 import { RouterStub } from '../testing/router.stub';
+import { of as observableOf } from 'rxjs';
+import { PaginatedSearchOptions } from '../search/models/paginated-search-options.model';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 
 describe('SearchFormComponent', () => {
   let comp: SearchFormComponent;
@@ -24,10 +27,19 @@ describe('SearchFormComponent', () => {
   let de: DebugElement;
   let el: HTMLElement;
 
+  const mockSearchOptions = observableOf(new PaginatedSearchOptions({
+    pagination: Object.assign(new PaginationComponentOptions(), {
+      id: 'test-id',
+      pageSize: 10,
+      currentPage: 1
+    }),
+    scope: 'MCU'
+  }));
+
   const router = new RouterStub();
   const searchService = new SearchServiceStub();
   const paginationService = new PaginationServiceStub();
-  const searchConfigService = { paginationID: 'test-id' };
+  const searchConfigService = { paginationID: 'test-id', paginatedSearchOptions: mockSearchOptions};
   const dspaceObjectService = {
     findById: () => createSuccessfulRemoteDataObject$(undefined),
   };
@@ -105,12 +117,10 @@ describe('SearchFormComponent', () => {
     let searchQuery = {};
 
     it('should navigate to the search page even when no parameters are provided', () => {
+      searchQuery = {};
       comp.updateSearch(searchQuery);
 
-      expect(router.navigate).toHaveBeenCalledWith(comp.getSearchLinkParts(), {
-        queryParams: searchQuery,
-        queryParamsHandling: 'merge'
-      });
+      expect(paginationService.updateRoute).toHaveBeenCalledWith(undefined, {}, {}, false);
     });
 
     it('should navigate to the search page with parameters only query if only query is provided', () => {
@@ -120,10 +130,7 @@ describe('SearchFormComponent', () => {
 
       comp.updateSearch(searchQuery);
 
-      expect(router.navigate).toHaveBeenCalledWith(comp.getSearchLinkParts(), {
-        queryParams: searchQuery,
-        queryParamsHandling: 'merge'
-      });
+      expect(paginationService.updateRoute).toHaveBeenCalledWith(undefined, {}, { query: 'THOR' }, false);
     });
 
     it('should navigate to the search page with parameters only query if only scope is provided', () => {
@@ -133,10 +140,7 @@ describe('SearchFormComponent', () => {
 
       comp.updateSearch(searchQuery);
 
-      expect(router.navigate).toHaveBeenCalledWith(comp.getSearchLinkParts(), {
-        queryParams: searchQuery,
-        queryParamsHandling: 'merge'
-      });
+      expect(paginationService.updateRoute).toHaveBeenCalledWith(undefined, {}, { scope: 'MCU' }, false);
     });
   });
 
diff --git a/src/app/shared/search-form/search-form.component.ts b/src/app/shared/search-form/search-form.component.ts
index 151ded6f9e9..3ca416652e5 100644
--- a/src/app/shared/search-form/search-form.component.ts
+++ b/src/app/shared/search-form/search-form.component.ts
@@ -63,6 +63,11 @@ export class SearchFormComponent implements OnChanges {
    */
   @Input() showScopeSelector = false;
 
+  /**
+   * Should scroll to the pagination component after updating the route instead of the top of the page
+   */
+  @Input() retainScrollPosition = false;
+
   /**
    * Output the search data on submit
    */
@@ -116,10 +121,7 @@ export class SearchFormComponent implements OnChanges {
   updateSearch(data: any) {
     const queryParams = Object.assign({}, data);
 
-    void this.router.navigate(this.getSearchLinkParts(), {
-      queryParams: queryParams,
-      queryParamsHandling: 'merge'
-    });
+    this.paginationService.updateRoute(this.searchConfig.paginatedSearchOptions?.value?.pagination?.id, {}, queryParams, this.retainScrollPosition);
   }
 
   /**
diff --git a/src/app/shared/search-form/themed-search-form.component.ts b/src/app/shared/search-form/themed-search-form.component.ts
index 50b3751b06d..21e9a9b5103 100644
--- a/src/app/shared/search-form/themed-search-form.component.ts
+++ b/src/app/shared/search-form/themed-search-form.component.ts
@@ -28,10 +28,13 @@ export class ThemedSearchFormComponent extends ThemedComponent<SearchFormCompone
 
   @Input() showScopeSelector: boolean;
 
+  @Input() retainScrollPosition: boolean;
+
   @Output() submitSearch: EventEmitter<any> = new EventEmitter();
 
   protected inAndOutputNames: (keyof SearchFormComponent & keyof this)[] = [
     'query', 'inPlaceSearch', 'scope', 'currentUrl', 'large', 'brandColor', 'searchPlaceholder', 'showScopeSelector',
+    'retainScrollPosition',
     'submitSearch',
   ];
 
diff --git a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html
index fdf154bc045..7fded0de34a 100644
--- a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html
@@ -1,9 +1,9 @@
 <div>
     <div class="filters py-2">
-        <ds-search-facet-selected-option *ngFor="let value of (selectedValues$ | async)" [selectedValue]="value" [filterConfig]="filterConfig" [selectedValues$]="selectedValues$" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-selected-option>
+        <ds-search-facet-selected-option *ngFor="let value of (selectedValues$ | async)" [selectedValue]="value" [filterConfig]="filterConfig" [selectedValues$]="selectedValues$" [inPlaceSearch]="inPlaceSearch" [retainScrollPosition]="retainScrollPosition"></ds-search-facet-selected-option>
         <ng-container *ngFor="let page of (filterValues$ | async)?.payload">
           <div [@facetLoad]="animationState">
-                  <ds-search-facet-option *ngFor="let value of page.page; trackBy: trackUpdate" [filterConfig]="filterConfig" [filterValue]="value" [selectedValues$]="selectedValues$" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-option>
+                  <ds-search-facet-option *ngFor="let value of page.page; trackBy: trackUpdate" [filterConfig]="filterConfig" [filterValue]="value" [selectedValues$]="selectedValues$" [inPlaceSearch]="inPlaceSearch" [retainScrollPosition]="retainScrollPosition"></ds-search-facet-option>
           </div>
         </ng-container>
         <div class="clearfix toggle-more-filters">
diff --git a/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html
index 7d0ad899142..fb3538de39a 100644
--- a/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html
@@ -1,9 +1,9 @@
 <div>
     <div class="filters py-2">
-        <ds-search-facet-selected-option *ngFor="let value of (selectedValues$ | async)" [selectedValue]="value" [filterConfig]="filterConfig" [selectedValues$]="selectedValues$" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-selected-option>
+        <ds-search-facet-selected-option *ngFor="let value of (selectedValues$ | async)" [selectedValue]="value" [filterConfig]="filterConfig" [selectedValues$]="selectedValues$" [inPlaceSearch]="inPlaceSearch" [retainScrollPosition]="retainScrollPosition"></ds-search-facet-selected-option>
       <ng-container *ngFor="let page of (filterValues$ | async)?.payload">
         <div [@facetLoad]="animationState">
-            <ds-search-facet-option *ngFor="let value of page.page; trackBy: trackUpdate" [filterConfig]="filterConfig" [filterValue]="value" [selectedValues$]="selectedValues$" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-option>
+            <ds-search-facet-option *ngFor="let value of page.page; trackBy: trackUpdate" [filterConfig]="filterConfig" [filterValue]="value" [selectedValues$]="selectedValues$" [inPlaceSearch]="inPlaceSearch" [retainScrollPosition]="retainScrollPosition"></ds-search-facet-option>
         </div>
         </ng-container>
         <div class="clearfix toggle-more-filters">
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
index 9a4bffadb8d..2601576b2a4 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
@@ -1,5 +1,6 @@
 <a *ngIf="isVisible | async" class="d-flex flex-row"
    [tabIndex]="-1"
+   [preserveFragment]="retainScrollPosition"
    [routerLink]="[searchLink]"
    [queryParams]="addQueryParams" queryParamsHandling="merge">
   <label class="mb-0 d-flex w-100">
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
index cdbab61a309..e6610c1ee9a 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
@@ -42,6 +42,11 @@ export class SearchFacetOptionComponent implements OnInit, OnDestroy {
    */
   @Input() inPlaceSearch;
 
+  /**
+   * Should scroll to the pagination component after updating the route instead of the top of the page
+   */
+  @Input() retainScrollPosition = false;
+
   /**
    * Emits true when this option should be visible and false when it should be invisible
    */
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html
index 0e6090b0faa..53d2f10e105 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html
@@ -1,5 +1,6 @@
 <a *ngIf="isVisible | async" class="d-flex flex-row"
    [routerLink]="[searchLink]"
+   [preserveFragment]="retainScrollPosition"
    [queryParams]="changeQueryParams" queryParamsHandling="merge">
   <span class="filter-value px-1">{{filterValue.label}}</span>
   <span class="float-right filter-value-count ml-auto">
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
index b08a54e42ba..1750e5e7e28 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
@@ -43,6 +43,11 @@ export class SearchFacetRangeOptionComponent implements OnInit, OnDestroy {
    */
   @Input() inPlaceSearch;
 
+  /**
+   * Should scroll to the pagination component after updating the route instead of the top of the page
+   */
+  @Input() retainScrollPosition = false;
+
   /**
    * Emits true when this option should be visible and false when it should be invisible
    */
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html
index d5f88c53332..6fb1725d7f4 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html
@@ -1,5 +1,6 @@
 <a class="d-flex flex-row"
    [tabIndex]="-1"
+   [preserveFragment]="retainScrollPosition"
    [routerLink]="[searchLink]"
    [queryParams]="removeQueryParams" queryParamsHandling="merge">
   <label class="mb-0 d-flex w-100">
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts
index 4566b882eb3..08b1bce5b22 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts
@@ -41,6 +41,11 @@ export class SearchFacetSelectedOptionComponent implements OnInit, OnDestroy {
    */
   @Input() inPlaceSearch;
 
+  /**
+   * Should scroll to the pagination component after updating the route instead of the top of the page
+   */
+  @Input() retainScrollPosition = false;
+
   /**
    * UI parameters when this filter is removed
    */
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts
index 0aa131d4282..48e4aa02275 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts
@@ -10,6 +10,7 @@ import {
 import { GenericConstructor } from '../../../../../core/shared/generic-constructor';
 import { SearchFacetFilterComponent } from '../search-facet-filter/search-facet-filter.component';
 import { BehaviorSubject } from 'rxjs';
+import { RETAIN_SCROLL_POSITION } from '../../../../../core/pagination/pagination.service';
 
 @Component({
   selector: 'ds-search-facet-filter-wrapper',
@@ -35,6 +36,11 @@ export class SearchFacetFilterWrapperComponent implements OnInit {
    */
   @Input() refreshFilters: BehaviorSubject<boolean>;
 
+  /**
+   * Should scroll to the pagination component after updating the route instead of the top of the page
+   */
+  @Input() retainScrollPosition = false;
+
   /**
    * The constructor of the search facet filter that should be rendered, based on the filter config's type
    */
@@ -56,7 +62,8 @@ export class SearchFacetFilterWrapperComponent implements OnInit {
       providers: [
         { provide: FILTER_CONFIG, useFactory: () => (this.filterConfig), deps: [] },
         { provide: IN_PLACE_SEARCH, useFactory: () => (this.inPlaceSearch), deps: [] },
-        { provide: REFRESH_FILTER, useFactory: () => (this.refreshFilters), deps: [] }
+        { provide: REFRESH_FILTER, useFactory: () => (this.refreshFilters), deps: [] },
+        { provide: RETAIN_SCROLL_POSITION, useFactory: () => this.retainScrollPosition, deps: [] },
       ],
       parent: this.injector
     });
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
index 92d2e5265ba..9125b72e7f3 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
@@ -24,6 +24,11 @@ import { RemoteDataBuildService } from '../../../../../core/cache/builders/remot
 import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
 import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
+import { RETAIN_SCROLL_POSITION } from '../../../../../core/pagination/pagination.service';
+import { PaginationServiceStub } from '../../../../testing/pagination-service.stub';
+import { PaginationService } from 'ngx-pagination';
+import { RouteService } from '../../../../../core/services/route.service';
+import { routeServiceStub } from '../../../../testing/route-service.stub';
 
 describe('SearchFacetFilterComponent', () => {
   let comp: SearchFacetFilterComponent;
@@ -94,11 +99,14 @@ describe('SearchFacetFilterComponent', () => {
       providers: [
         { provide: SearchService, useValue: new SearchServiceStub(searchLink) },
         { provide: Router, useValue: new RouterStub() },
+        { provide: RouteService, useValue: routeServiceStub },
+        { provide: PaginationService, useValue: new PaginationServiceStub() },
         { provide: FILTER_CONFIG, useValue: new SearchFilterConfig() },
         { provide: RemoteDataBuildService, useValue: { aggregate: () => observableOf({}) } },
         { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
         { provide: IN_PLACE_SEARCH, useValue: false },
         { provide: REFRESH_FILTER, useValue: new BehaviorSubject<boolean>(false) },
+        { provide: RETAIN_SCROLL_POSITION, useValue: new BehaviorSubject<boolean>(false) },
         {
           provide: SearchFilterService, useValue: {
             getSelectedValuesForFilter: () => observableOf(selectedValues),
@@ -213,8 +221,9 @@ describe('SearchFacetFilterComponent', () => {
     it('should call navigate on the router with the right searchlink and parameters when the filter is provided with a valid operator', () => {
       comp.onSubmit(testValue + ',equals');
       expect(router.navigate).toHaveBeenCalledWith(searchUrl.split('/'), {
-        queryParams: { [mockFilterConfig.paramName]: [...selectedValues.map((value) => `${value},equals`), `${testValue},equals`] },
-        queryParamsHandling: 'merge'
+        queryParams: jasmine.objectContaining({ [mockFilterConfig.paramName]: [...selectedValues.map((value) => `${value},equals`), `${testValue},equals`] }),
+        queryParamsHandling: 'merge',
+        fragment: 'prevent-scroll',
       });
     });
 
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
index 2b2eb9b11a7..c15fa0b6a84 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
@@ -35,6 +35,7 @@ import { currentPath } from '../../../../utils/route.utils';
 import { getFacetValueForType, stripOperatorFromFilterValue } from '../../../search.utils';
 import { createPendingRemoteDataObject } from '../../../../remote-data.utils';
 import { FacetValues } from '../../../models/facet-values.model';
+import { RETAIN_SCROLL_POSITION, PaginationService } from '../../../../../core/pagination/pagination.service';
 
 @Component({
   selector: 'ds-search-facet-filter',
@@ -99,12 +100,15 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
 
   constructor(protected searchService: SearchService,
               protected filterService: SearchFilterService,
+              protected paginationService: PaginationService,
               protected rdbs: RemoteDataBuildService,
               protected router: Router,
               @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
               @Inject(IN_PLACE_SEARCH) public inPlaceSearch: boolean,
               @Inject(FILTER_CONFIG) public filterConfig: SearchFilterConfig,
-              @Inject(REFRESH_FILTER) public refreshFilters: BehaviorSubject<boolean>) {
+              @Inject(REFRESH_FILTER) public refreshFilters: BehaviorSubject<boolean>,
+              @Inject(RETAIN_SCROLL_POSITION) protected retainScrollPosition: boolean,
+  ) {
   }
 
   /**
@@ -256,16 +260,12 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
     if (data.match(new RegExp(`^.+,(equals|query|authority)$`))) {
       this.selectedValues$.pipe(take(1)).subscribe((selectedValues) => {
         if (isNotEmpty(data)) {
-          this.router.navigate(this.getSearchLinkParts(), {
-            queryParams:
-              {
-                [this.filterConfig.paramName]: [
-                  ...selectedValues.map((facet) => this.getFacetValue(facet)),
-                  data
-                ]
-              },
-            queryParamsHandling: 'merge'
-          });
+          this.paginationService.updateRouteWithUrl(this.searchConfigService.paginationID, this.getSearchLinkParts(), { page: 1 }, {
+            [this.filterConfig.paramName]: [
+              ...selectedValues.map((facet) => this.getFacetValue(facet)),
+              data
+            ]
+          }, this.retainScrollPosition);
           this.filter = '';
         }
         this.filterSearchResults = observableOf([]);
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-filter.component.html
index a6fb0021b7f..9c8f4e0a4d3 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.html
@@ -20,7 +20,8 @@ <h5 class="d-inline-block mb-0">
     <ds-search-facet-filter-wrapper
       [filterConfig]="filter"
       [inPlaceSearch]="inPlaceSearch"
-      [refreshFilters]="refreshFilters" >
+      [refreshFilters]="refreshFilters"
+      [retainScrollPosition]="retainScrollPosition">
     </ds-search-facet-filter-wrapper>
   </div>
 </div>
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
index d1d3bd729d4..9ef754115c9 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
@@ -38,6 +38,11 @@ export class SearchFilterComponent implements OnInit {
    */
   @Input() refreshFilters: BehaviorSubject<boolean>;
 
+  /**
+   * Should scroll to the pagination component after updating the route instead of the top of the page
+   */
+  @Input() retainScrollPosition = false;
+
   /**
    * True when the filter is 100% collapsed in the UI
    */
diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html
index eb49235641f..0dced440018 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html
@@ -1,9 +1,9 @@
 <div>
     <div class="filters py-2">
-        <ds-search-facet-selected-option *ngFor="let value of (selectedValues$ | async)" [selectedValue]="value" [filterConfig]="filterConfig" [selectedValues$]="selectedValues$" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-selected-option>
+        <ds-search-facet-selected-option *ngFor="let value of (selectedValues$ | async)" [selectedValue]="value" [filterConfig]="filterConfig" [selectedValues$]="selectedValues$" [inPlaceSearch]="inPlaceSearch" [retainScrollPosition]="retainScrollPosition"></ds-search-facet-selected-option>
         <ng-container *ngFor="let page of (filterValues$ | async)?.payload">
           <div [@facetLoad]="animationState">
-            <ds-search-facet-option *ngFor="let value of page.page; trackBy: trackUpdate" [filterConfig]="filterConfig" [filterValue]="value" [selectedValues$]="selectedValues$" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-option>
+            <ds-search-facet-option *ngFor="let value of page.page; trackBy: trackUpdate" [filterConfig]="filterConfig" [filterValue]="value" [selectedValues$]="selectedValues$" [inPlaceSearch]="inPlaceSearch" [retainScrollPosition]="retainScrollPosition"></ds-search-facet-option>
           </div>
         </ng-container>
         <div class="clearfix toggle-more-filters">
diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
index e6c74d80478..0948bd93ab6 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
@@ -26,6 +26,9 @@ import { SearchConfigurationServiceStub } from '../../../../testing/search-confi
 import { VocabularyEntryDetail } from '../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
 import { FacetValue} from '../../../models/facet-value.model';
 import { SearchFilterConfig } from '../../../models/search-filter-config.model';
+import { RETAIN_SCROLL_POSITION } from '../../../../../core/pagination/pagination.service';
+import { routeServiceStub } from '../../../../testing/route-service.stub';
+import { RouteService } from '../../../../../core/services/route.service';
 
 describe('SearchHierarchyFilterComponent', () => {
 
@@ -75,7 +78,9 @@ describe('SearchHierarchyFilterComponent', () => {
         { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
         { provide: IN_PLACE_SEARCH, useValue: false },
         { provide: FILTER_CONFIG, useValue: Object.assign(new SearchFilterConfig(), { name: testSearchFilter }) },
-        { provide: REFRESH_FILTER, useValue: new BehaviorSubject<boolean>(false)}
+        { provide: REFRESH_FILTER, useValue: new BehaviorSubject<boolean>(false) },
+        { provide: RouteService, useValue: routeServiceStub },
+        { provide: RETAIN_SCROLL_POSITION, useValue: new BehaviorSubject<boolean>(false) },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
index f9b3f2bff94..8fcef287799 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
@@ -26,6 +26,7 @@ import { PageInfo } from '../../../../../core/shared/page-info.model';
 import { environment } from '../../../../../../environments/environment';
 import { addOperatorToFilterValue } from '../../../search.utils';
 import { VocabularyTreeviewModalComponent } from '../../../../form/vocabulary-treeview-modal/vocabulary-treeview-modal.component';
+import { RETAIN_SCROLL_POSITION, PaginationService } from '../../../../../core/pagination/pagination.service';
 
 @Component({
   selector: 'ds-search-hierarchy-filter',
@@ -42,6 +43,7 @@ export class SearchHierarchyFilterComponent extends SearchFacetFilterComponent i
 
   constructor(protected searchService: SearchService,
               protected filterService: SearchFilterService,
+              protected paginationService: PaginationService,
               protected rdbs: RemoteDataBuildService,
               protected router: Router,
               protected modalService: NgbModal,
@@ -49,9 +51,10 @@ export class SearchHierarchyFilterComponent extends SearchFacetFilterComponent i
               @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
               @Inject(IN_PLACE_SEARCH) public inPlaceSearch: boolean,
               @Inject(FILTER_CONFIG) public filterConfig: SearchFilterConfig,
-              @Inject(REFRESH_FILTER) public refreshFilters: BehaviorSubject<boolean>
+              @Inject(REFRESH_FILTER) public refreshFilters: BehaviorSubject<boolean>,
+              @Inject(RETAIN_SCROLL_POSITION) protected retainScrollPosition: boolean
   ) {
-    super(searchService, filterService, rdbs, router, searchConfigService, inPlaceSearch, filterConfig, refreshFilters);
+    super(searchService, filterService, paginationService, rdbs, router, searchConfigService, inPlaceSearch, filterConfig, refreshFilters, retainScrollPosition);
   }
 
   vocabularyExists$: Observable<boolean>;
@@ -95,16 +98,10 @@ export class SearchHierarchyFilterComponent extends SearchFacetFilterComponent i
       this.selectedValues$
         .pipe(take(1))
         .subscribe((selectedValues) => {
-          this.router.navigate(
-            [this.searchService.getSearchLink()],
-            {
-              queryParams: {
-                [this.filterConfig.paramName]: [...selectedValues, {value: detail.value}]
-                  .map((facetValue: FacetValue) => getFacetValueForType(facetValue, this.filterConfig)),
-              },
-              queryParamsHandling: 'merge',
-            },
-          );
+          this.paginationService.updateRouteWithUrl(this.searchConfigService.paginationID, this.getSearchLinkParts(), {}, {
+            [this.filterConfig.paramName]: [...selectedValues, {value: detail.value}]
+              .map((facetValue: FacetValue) => getFacetValueForType(facetValue, this.filterConfig)),
+          }, this.retainScrollPosition);
         });
     }).catch();
   }
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
index 7834c4c5571..e67b33fa85f 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
@@ -41,7 +41,7 @@
         </ng-container>
       <ng-container *ngFor="let page of (filterValues$ | async)?.payload">
         <div [@facetLoad]="animationState">
-          <ds-search-facet-range-option *ngFor="let value of page.page; trackBy: trackUpdate" [filterConfig]="filterConfig" [filterValue]="value" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-range-option>
+          <ds-search-facet-range-option *ngFor="let value of page.page; trackBy: trackUpdate" [filterConfig]="filterConfig" [filterValue]="value" [inPlaceSearch]="inPlaceSearch" [retainScrollPosition]="retainScrollPosition"></ds-search-facet-range-option>
           </div>
         </ng-container>
     </div>
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts
index 3a146f50590..ee86af7b80e 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts
@@ -25,6 +25,7 @@ import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-p
 import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub';
 import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
 import { RouteService } from '../../../../../core/services/route.service';
+import { RETAIN_SCROLL_POSITION } from '../../../../../core/pagination/pagination.service';
 
 describe('SearchRangeFilterComponent', () => {
   let comp: SearchRangeFilterComponent;
@@ -105,6 +106,7 @@ describe('SearchRangeFilterComponent', () => {
         { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
         { provide: IN_PLACE_SEARCH, useValue: false },
         { provide: REFRESH_FILTER, useValue: new BehaviorSubject<boolean>(false) },
+        { provide: RETAIN_SCROLL_POSITION, useValue: new BehaviorSubject<boolean>(false) },
         {
           provide: SearchFilterService, useValue: {
             getSelectedValuesForFilter: () => selectedValues,
@@ -146,11 +148,12 @@ describe('SearchRangeFilterComponent', () => {
 
     it('should call navigate on the router with the right searchlink and parameters', () => {
       expect(router.navigate).toHaveBeenCalledWith(searchUrl.split('/'), {
-        queryParams: {
+        queryParams: jasmine.objectContaining({
           [mockFilterConfig.paramName + minSuffix]: [1900],
-          [mockFilterConfig.paramName + maxSuffix]: [1950]
-        },
-        queryParamsHandling: 'merge'
+          [mockFilterConfig.paramName + maxSuffix]: [1950],
+        }),
+        queryParamsHandling: 'merge',
+        fragment: 'prevent-scroll',
       });
     });
   });
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
index 938f67412e4..4a6eadf4f76 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
@@ -20,6 +20,7 @@ import { SearchConfigurationService } from '../../../../../core/shared/search/se
 import { RouteService } from '../../../../../core/services/route.service';
 import { hasValue } from '../../../../empty.util';
 import { yearFromString } from 'src/app/shared/date.util';
+import { RETAIN_SCROLL_POSITION, PaginationService } from '../../../../../core/pagination/pagination.service';
 
 /**
  * The suffix for a range filters' minimum in the frontend URL
@@ -76,6 +77,7 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
 
   constructor(protected searchService: SearchService,
               protected filterService: SearchFilterService,
+              protected paginationService: PaginationService,
               protected router: Router,
               protected rdbs: RemoteDataBuildService,
               @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
@@ -83,8 +85,9 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
               @Inject(FILTER_CONFIG) public filterConfig: SearchFilterConfig,
               @Inject(PLATFORM_ID) private platformId: any,
               @Inject(REFRESH_FILTER) public refreshFilters: BehaviorSubject<boolean>,
+              @Inject(RETAIN_SCROLL_POSITION) protected retainScrollPosition: boolean,
               private route: RouteService) {
-    super(searchService, filterService, rdbs, router, searchConfigService, inPlaceSearch, filterConfig, refreshFilters);
+    super(searchService, filterService, paginationService, rdbs, router, searchConfigService, inPlaceSearch, filterConfig, refreshFilters, retainScrollPosition);
 
   }
 
@@ -117,14 +120,10 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
 
     const newMin = this.range[0] !== this.min ? [this.range[0]] : null;
     const newMax = this.range[1] !== this.max ? [this.range[1]] : null;
-    this.router.navigate(this.getSearchLinkParts(), {
-      queryParams:
-        {
-          [this.filterConfig.paramName + RANGE_FILTER_MIN_SUFFIX]: newMin,
-          [this.filterConfig.paramName + RANGE_FILTER_MAX_SUFFIX]: newMax
-        },
-      queryParamsHandling: 'merge'
-    });
+    this.paginationService.updateRouteWithUrl(this.searchConfigService.paginationID, this.getSearchLinkParts(), {}, {
+      [this.filterConfig.paramName + RANGE_FILTER_MIN_SUFFIX]: newMin,
+      [this.filterConfig.paramName + RANGE_FILTER_MAX_SUFFIX]: newMax
+    }, this.retainScrollPosition);
     this.filter = '';
   }
 
diff --git a/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html
index fdf154bc045..7fded0de34a 100644
--- a/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html
@@ -1,9 +1,9 @@
 <div>
     <div class="filters py-2">
-        <ds-search-facet-selected-option *ngFor="let value of (selectedValues$ | async)" [selectedValue]="value" [filterConfig]="filterConfig" [selectedValues$]="selectedValues$" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-selected-option>
+        <ds-search-facet-selected-option *ngFor="let value of (selectedValues$ | async)" [selectedValue]="value" [filterConfig]="filterConfig" [selectedValues$]="selectedValues$" [inPlaceSearch]="inPlaceSearch" [retainScrollPosition]="retainScrollPosition"></ds-search-facet-selected-option>
         <ng-container *ngFor="let page of (filterValues$ | async)?.payload">
           <div [@facetLoad]="animationState">
-                  <ds-search-facet-option *ngFor="let value of page.page; trackBy: trackUpdate" [filterConfig]="filterConfig" [filterValue]="value" [selectedValues$]="selectedValues$" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-option>
+                  <ds-search-facet-option *ngFor="let value of page.page; trackBy: trackUpdate" [filterConfig]="filterConfig" [filterValue]="value" [selectedValues$]="selectedValues$" [inPlaceSearch]="inPlaceSearch" [retainScrollPosition]="retainScrollPosition"></ds-search-facet-option>
           </div>
         </ng-container>
         <div class="clearfix toggle-more-filters">
diff --git a/src/app/shared/search/search-filters/search-filters.component.html b/src/app/shared/search/search-filters/search-filters.component.html
index e392cd2663e..7a09fc62da3 100644
--- a/src/app/shared/search/search-filters/search-filters.component.html
+++ b/src/app/shared/search/search-filters/search-filters.component.html
@@ -1,7 +1,7 @@
 <h3>{{"search.filters.head" | translate}}</h3>
 <div *ngIf="(filters | async)?.hasSucceeded">
     <div *ngFor="let filter of (filters | async)?.payload; trackBy: trackUpdate">
-        <ds-search-filter [filter]="filter" [inPlaceSearch]="inPlaceSearch" [refreshFilters]="refreshFilters"></ds-search-filter>
+        <ds-search-filter [filter]="filter" [inPlaceSearch]="inPlaceSearch" [refreshFilters]="refreshFilters" [retainScrollPosition]="retainScrollPosition"></ds-search-filter>
     </div>
 </div>
-<a class="btn btn-primary" [routerLink]="[searchLink]" [queryParams]="clearParams | async" queryParamsHandling="merge" role="button"><i class="fas fa-undo"></i> {{"search.filters.reset" | translate}}</a>
+<a class="btn btn-primary" [routerLink]="[searchLink]" [preserveFragment]="retainScrollPosition" [queryParams]="clearParams | async" queryParamsHandling="merge" role="button"><i class="fas fa-undo"></i> {{"search.filters.reset" | translate}}</a>
diff --git a/src/app/shared/search/search-filters/search-filters.component.ts b/src/app/shared/search/search-filters/search-filters.component.ts
index 766939226dd..a74235bfbe7 100644
--- a/src/app/shared/search/search-filters/search-filters.component.ts
+++ b/src/app/shared/search/search-filters/search-filters.component.ts
@@ -55,6 +55,11 @@ export class SearchFiltersComponent implements OnInit, OnDestroy {
    */
   @Input() refreshFilters: BehaviorSubject<boolean>;
 
+  /**
+   * Should scroll to the pagination component after updating the route instead of the top of the page
+   */
+  @Input() retainScrollPosition = false;
+
   /**
    * Link to the search page
    */
diff --git a/src/app/shared/search/search-filters/themed-search-filters.component.ts b/src/app/shared/search/search-filters/themed-search-filters.component.ts
index a9a9c10e519..5ebb51de267 100644
--- a/src/app/shared/search/search-filters/themed-search-filters.component.ts
+++ b/src/app/shared/search/search-filters/themed-search-filters.component.ts
@@ -20,9 +20,16 @@ export class ThemedSearchFiltersComponent extends ThemedComponent<SearchFiltersC
   @Input() inPlaceSearch;
   @Input() refreshFilters: Observable<any>;
   @Input() filters: Observable<RemoteData<SearchFilterConfig[]>>;
+  @Input() retainScrollPosition: boolean;
 
   protected inAndOutputNames: (keyof SearchFiltersComponent & keyof this)[] = [
-    'filters', 'currentConfiguration', 'currentScope', 'inPlaceSearch', 'refreshFilters'];
+    'currentConfiguration',
+    'currentScope',
+    'filters',
+    'inPlaceSearch',
+    'refreshFilters',
+    'retainScrollPosition',
+  ];
 
   protected getComponentName(): string {
     return 'SearchFiltersComponent';
diff --git a/src/app/shared/search/search-labels/search-label/search-label.component.html b/src/app/shared/search/search-labels/search-label/search-label.component.html
index bffb7f9329b..7a67d2973b3 100644
--- a/src/app/shared/search/search-labels/search-label/search-label.component.html
+++ b/src/app/shared/search/search-labels/search-label/search-label.component.html
@@ -1,5 +1,6 @@
 <a class="badge badge-primary mr-1 mb-1 text-capitalize"
    [routerLink]="searchLink"
+   [preserveFragment]="retainScrollPosition"
    [queryParams]="(removeParameters | async)" queryParamsHandling="merge">
     {{('search.filters.applied.' + key) | translate}}: {{'search.filters.' + filterName + '.' + value | translate: {default: normalizeFilterValue(value)} }}
     <span> ×</span>
diff --git a/src/app/shared/search/search-labels/search-label/search-label.component.ts b/src/app/shared/search/search-labels/search-label/search-label.component.ts
index ab4c57d9f53..1c525904354 100644
--- a/src/app/shared/search/search-labels/search-label/search-label.component.ts
+++ b/src/app/shared/search/search-labels/search-label/search-label.component.ts
@@ -22,6 +22,7 @@ export class SearchLabelComponent implements OnInit {
   @Input() value: string;
   @Input() inPlaceSearch: boolean;
   @Input() appliedFilters: Observable<Params>;
+  @Input() retainScrollPosition: boolean;
   searchLink: string;
   removeParameters: Observable<Params>;
 
diff --git a/src/app/shared/search/search-labels/search-labels.component.html b/src/app/shared/search/search-labels/search-labels.component.html
index f6af072c517..6c3a6be1256 100644
--- a/src/app/shared/search/search-labels/search-labels.component.html
+++ b/src/app/shared/search/search-labels/search-labels.component.html
@@ -1,5 +1,5 @@
 <div class="labels">
     <ng-container *ngFor="let key of ((appliedFilters | async) | dsObjectKeys)">
-        <ds-search-label *ngFor="let value of (appliedFilters | async)[key]" [inPlaceSearch]="inPlaceSearch" [key]="key" [value]="value" [appliedFilters]="appliedFilters"></ds-search-label>
+        <ds-search-label *ngFor="let value of (appliedFilters | async)[key]" [inPlaceSearch]="inPlaceSearch" [key]="key" [value]="value" [appliedFilters]="appliedFilters" [retainScrollPosition]="retainScrollPosition"></ds-search-label>
     </ng-container>
 </div>
diff --git a/src/app/shared/search/search-labels/search-labels.component.ts b/src/app/shared/search/search-labels/search-labels.component.ts
index 2cc1919f500..6c4cf9ee240 100644
--- a/src/app/shared/search/search-labels/search-labels.component.ts
+++ b/src/app/shared/search/search-labels/search-labels.component.ts
@@ -25,6 +25,11 @@ export class SearchLabelsComponent {
    */
   @Input() inPlaceSearch;
 
+  /**
+   * Should scroll to the pagination component after updating the route instead of the top of the page
+   */
+  @Input() retainScrollPosition = false;
+
   /**
    * Initialize the instance variable
    */
diff --git a/src/app/shared/search/search-results/search-results.component.html b/src/app/shared/search/search-results/search-results.component.html
index 11c589254a2..5a1f598268f 100644
--- a/src/app/shared/search/search-results/search-results.component.html
+++ b/src/app/shared/search/search-results/search-results.component.html
@@ -14,6 +14,7 @@ <h2 *ngIf="!disableHeader">{{ (configuration ? configuration + '.search.results.
             [context]="context"
             [hidePaginationDetail]="hidePaginationDetail"
             [showThumbnails]="showThumbnails"
+            [retainScrollPosition]="retainScrollPosition"
             (contentChange)="contentChange.emit($event)"
             (deselectObject)="deselectObject.emit($event)"
             (selectObject)="selectObject.emit($event)">
diff --git a/src/app/shared/search/search-results/search-results.component.ts b/src/app/shared/search/search-results/search-results.component.ts
index 15d2cc0f008..1d8837dfec5 100644
--- a/src/app/shared/search/search-results/search-results.component.ts
+++ b/src/app/shared/search/search-results/search-results.component.ts
@@ -95,6 +95,11 @@ export class SearchResultsComponent {
    */
   @Input() selectionConfig: SelectionConfig = null;
 
+  /**
+   * Should scroll to the pagination component after updating the route instead of the top of the page
+   */
+  @Input() retainScrollPosition = false;
+
   /**
    * Emit when one of the listed object has changed.
    */
diff --git a/src/app/shared/search/search-results/themed-search-results.component.ts b/src/app/shared/search/search-results/themed-search-results.component.ts
index 01ee5761f3a..d7c8f74f972 100644
--- a/src/app/shared/search/search-results/themed-search-results.component.ts
+++ b/src/app/shared/search/search-results/themed-search-results.component.ts
@@ -21,7 +21,7 @@ import { ListableObject } from '../../object-collection/shared/listable-object.m
   templateUrl: '../../theme-support/themed.component.html',
 })
 export class ThemedSearchResultsComponent extends ThemedComponent<SearchResultsComponent> {
-  protected inAndOutputNames: (keyof SearchResultsComponent & keyof this)[] = ['linkType', 'searchResults', 'searchConfig', 'showCsvExport', 'showThumbnails', 'sortConfig', 'viewMode', 'configuration', 'disableHeader', 'selectable', 'context', 'hidePaginationDetail', 'selectionConfig', 'contentChange', 'deselectObject', 'selectObject'];
+  protected inAndOutputNames: (keyof SearchResultsComponent & keyof this)[] = ['linkType', 'searchResults', 'searchConfig', 'showCsvExport', 'showThumbnails', 'sortConfig', 'viewMode', 'configuration', 'disableHeader', 'selectable', 'context', 'hidePaginationDetail', 'selectionConfig', 'contentChange', 'deselectObject', 'selectObject', 'retainScrollPosition'];
 
   @Input() linkType: CollectionElementLinkType;
 
@@ -49,6 +49,8 @@ export class ThemedSearchResultsComponent extends ThemedComponent<SearchResultsC
 
   @Input() selectionConfig: SelectionConfig;
 
+  @Input() retainScrollPosition: boolean;
+
   @Output() contentChange: EventEmitter<ListableObject> = new EventEmitter();
 
   @Output() deselectObject: EventEmitter<ListableObject> = new EventEmitter();
diff --git a/src/app/shared/search/search-settings/search-settings.component.html b/src/app/shared/search/search-settings/search-settings.component.html
index 40bca8e4e83..47b92bd785e 100644
--- a/src/app/shared/search/search-settings/search-settings.component.html
+++ b/src/app/shared/search/search-settings/search-settings.component.html
@@ -12,5 +12,5 @@ <h3>{{ 'search.sidebar.settings.title' | translate}}</h3>
         </option>
     </ds-sidebar-dropdown>
     </div>
-    <ds-page-size-selector></ds-page-size-selector>
+    <ds-page-size-selector [retainScrollPosition]="retainScrollPosition"></ds-page-size-selector>
 </ng-container>
diff --git a/src/app/shared/search/search-settings/search-settings.component.ts b/src/app/shared/search/search-settings/search-settings.component.ts
index 0efd38b5b28..0d484a58403 100644
--- a/src/app/shared/search/search-settings/search-settings.component.ts
+++ b/src/app/shared/search/search-settings/search-settings.component.ts
@@ -26,6 +26,12 @@ export class SearchSettingsComponent {
    */
   @Input() sortOptionsList: SortOptions[];
 
+
+  /**
+   * Should scroll to the pagination component after updating the route instead of the top of the page
+   */
+  @Input() retainScrollPosition = false;
+
   constructor(private service: SearchService,
               private route: ActivatedRoute,
               private router: Router,
@@ -43,6 +49,6 @@ export class SearchSettingsComponent {
       sortField: values[0],
       sortDirection: values[1] as SortDirection,
       page: 1
-    });
+    }, undefined, this.retainScrollPosition);
   }
 }
diff --git a/src/app/shared/search/search-settings/themed-search-settings.component.ts b/src/app/shared/search/search-settings/themed-search-settings.component.ts
index b1f1d082648..0dea1c10e53 100644
--- a/src/app/shared/search/search-settings/themed-search-settings.component.ts
+++ b/src/app/shared/search/search-settings/themed-search-settings.component.ts
@@ -14,10 +14,11 @@ import { SortOptions } from '../../../core/cache/models/sort-options.model';
 export class ThemedSearchSettingsComponent extends ThemedComponent<SearchSettingsComponent> {
   @Input() currentSortOption: SortOptions;
   @Input() sortOptionsList: SortOptions[];
+  @Input() retainScrollPosition: boolean;
 
 
   protected inAndOutputNames: (keyof SearchSettingsComponent & keyof this)[] = [
-    'currentSortOption', 'sortOptionsList'];
+    'currentSortOption', 'sortOptionsList', 'retainScrollPosition'];
 
   protected getComponentName(): string {
     return 'SearchSettingsComponent';
diff --git a/src/app/shared/search/search-sidebar/search-sidebar.component.html b/src/app/shared/search/search-sidebar/search-sidebar.component.html
index f489de5d289..0102eb51fa5 100644
--- a/src/app/shared/search/search-sidebar/search-sidebar.component.html
+++ b/src/app/shared/search/search-sidebar/search-sidebar.component.html
@@ -16,14 +16,17 @@
                                             [configurationList]="configurationList"
                                             [defaultConfiguration]="configuration"
                                             [inPlaceSearch]="inPlaceSearch"
+                                            [retainScrollPosition]="retainScrollPosition"
                                             (changeConfiguration)="changeConfiguration.emit($event)"></ds-search-switch-configuration>
-            <ds-themed-search-filters [currentScope]="currentScope"
+          <ds-themed-search-filters [currentScope]="currentScope"
                                [currentConfiguration]="configuration"
                                [filters]="filters"
                                [refreshFilters]="refreshFilters"
-                               [inPlaceSearch]="inPlaceSearch"></ds-themed-search-filters>
+                               [inPlaceSearch]="inPlaceSearch"
+                               [retainScrollPosition]="retainScrollPosition"></ds-themed-search-filters>
             <ds-themed-search-settings [currentSortOption]="currentSortOption"
-                                       [sortOptionsList]="sortOptionsList"></ds-themed-search-settings>
+                                       [sortOptionsList]="sortOptionsList"
+                                       [retainScrollPosition]="retainScrollPosition"></ds-themed-search-settings>
         </div>
     </div>
 </div>
diff --git a/src/app/shared/search/search-sidebar/search-sidebar.component.ts b/src/app/shared/search/search-sidebar/search-sidebar.component.ts
index 929f819ca3f..0ca7c3a3592 100644
--- a/src/app/shared/search/search-sidebar/search-sidebar.component.ts
+++ b/src/app/shared/search/search-sidebar/search-sidebar.component.ts
@@ -85,6 +85,11 @@ export class SearchSidebarComponent {
    */
   @Input() refreshFilters: BehaviorSubject<boolean>;
 
+  /**
+   * Should scroll to the pagination component after updating the route instead of the top of the page
+   */
+  @Input() retainScrollPosition = false;
+
   /**
    * Emits event when the user clicks a button to open or close the sidebar
    */
diff --git a/src/app/shared/search/search-sidebar/themed-search-sidebar.component.ts b/src/app/shared/search/search-sidebar/themed-search-sidebar.component.ts
index 935f7975328..5b88163c5cf 100644
--- a/src/app/shared/search/search-sidebar/themed-search-sidebar.component.ts
+++ b/src/app/shared/search/search-sidebar/themed-search-sidebar.component.ts
@@ -31,6 +31,7 @@ export class ThemedSearchSidebarComponent extends ThemedComponent<SearchSidebarC
   @Input() searchOptions: PaginatedSearchOptions;
   @Input() sortOptionsList: SortOptions[];
   @Input() refreshFilters: BehaviorSubject<boolean>;
+  @Input() retainScrollPosition: boolean;
   @Output() toggleSidebar = new EventEmitter<boolean>();
   @Output() changeConfiguration: EventEmitter<SearchConfigurationOption> = new EventEmitter<SearchConfigurationOption>();
   @Output() changeViewMode: EventEmitter<ViewMode> = new EventEmitter<ViewMode>();
@@ -38,7 +39,9 @@ export class ThemedSearchSidebarComponent extends ThemedComponent<SearchSidebarC
   protected inAndOutputNames: (keyof SearchSidebarComponent & keyof this)[] = [
     'configuration', 'configurationList', 'currentScope', 'currentSortOption',
     'resultCount', 'filters', 'viewModeList', 'showViewModes', 'inPlaceSearch',
-    'searchOptions', 'sortOptionsList', 'refreshFilters', 'toggleSidebar', 'changeConfiguration', 'changeViewMode'];
+    'searchOptions', 'sortOptionsList', 'refreshFilters', 'toggleSidebar', 'changeConfiguration', 'changeViewMode',
+    'retainScrollPosition',
+  ];
 
   protected getComponentName(): string {
     return 'SearchSidebarComponent';
diff --git a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts
index 8fc178c67a4..85bba8b03b0 100644
--- a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts
+++ b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts
@@ -102,6 +102,7 @@ describe('SearchSwitchConfigurationComponent', () => {
     comp.selectedOption = configurationList[1];
     const navigationExtras: NavigationExtras = {
       queryParams: { configuration: MyDSpaceConfigurationValueType.Workflow },
+      preserveFragment: false,
     };
 
     fixture.detectChanges();
diff --git a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.ts b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.ts
index 0e1b4f221b3..32b5ab2ff92 100644
--- a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.ts
+++ b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.ts
@@ -34,6 +34,10 @@ export class SearchSwitchConfigurationComponent implements OnDestroy, OnInit {
    * The default configuration to use if no defined
    */
   @Input() defaultConfiguration: string;
+  /**
+   * Should scroll to the pagination component after updating the route instead of the top of the page
+   */
+  @Input() retainScrollPosition = false;
   /**
    * The selected option
    */
@@ -71,6 +75,7 @@ export class SearchSwitchConfigurationComponent implements OnDestroy, OnInit {
   onSelect() {
     const navigationExtras: NavigationExtras = {
       queryParams: {configuration: this.selectedOption.value},
+      preserveFragment: this.retainScrollPosition,
     };
 
     this.changeConfiguration.emit(this.selectedOption);
diff --git a/src/app/shared/search/search.component.html b/src/app/shared/search/search.component.html
index d43f506866f..7ab50e14bd3 100644
--- a/src/app/shared/search/search.component.html
+++ b/src/app/shared/search/search.component.html
@@ -39,6 +39,7 @@
                                       [selectionConfig]="selectionConfig"
                                       [showCsvExport]="showCsvExport"
                                       [showThumbnails]="showThumbnails"
+                                      [retainScrollPosition]="retainScrollPosition"
                                       (contentChange)="onContentChange($event)"
                                       (deselectObject)="deselectObject.emit($event)"
                                       (selectObject)="selectObject.emit($event)"></ds-themed-search-results>
@@ -60,6 +61,7 @@
                        [inPlaceSearch]="inPlaceSearch"
                        [viewModeList]="viewModeList"
                        [showViewModes]="showViewModes"
+                       [retainScrollPosition]="retainScrollPosition"
                        (changeConfiguration)="changeContext($event.context)"
                        (changeViewMode)="changeViewMode()"></ds-themed-search-sidebar>
     <ds-themed-search-sidebar id="search-sidebar-sm" *ngIf="(isXsOrSm$ | async)"
@@ -74,6 +76,7 @@
                        [currentSortOption]="(currentSortOptions$ | async)"
                        [viewModeList]="viewModeList"
                        [showViewModes]="showViewModes"
+                       [retainScrollPosition]="retainScrollPosition"
                        (toggleSidebar)="closeSidebar()"
                        (changeConfiguration)="changeContext($event.context)"
                        (changeViewMode)="changeViewMode()">
@@ -87,11 +90,12 @@
                     [currentUrl]="searchLink"
                     [showScopeSelector]="showScopeSelector"
                     [inPlaceSearch]="inPlaceSearch"
+                    [retainScrollPosition]="retainScrollPosition"
                     [searchPlaceholder]="searchFormPlaceholder | translate">
     </ds-themed-search-form>
     <div class="row mb-3 mb-md-1">
         <div class="labels col-sm-9">
-            <ds-search-labels *ngIf="searchEnabled" [inPlaceSearch]="inPlaceSearch"></ds-search-labels>
+            <ds-search-labels *ngIf="searchEnabled" [inPlaceSearch]="inPlaceSearch" [retainScrollPosition]="retainScrollPosition"></ds-search-labels>
         </div>
     </div>
 </ng-template>
diff --git a/src/app/shared/search/search.component.ts b/src/app/shared/search/search.component.ts
index 61f3a119c87..554fd38be6f 100644
--- a/src/app/shared/search/search.component.ts
+++ b/src/app/shared/search/search.component.ts
@@ -166,6 +166,11 @@ export class SearchComponent implements OnInit {
    */
   @Input() query: string;
 
+  /**
+   * Should scroll to the pagination component after updating the route instead of the top of the page
+   */
+  @Input() retainScrollPosition = false;
+
   /**
    * The current configuration used during the search
    */
diff --git a/src/app/shared/search/themed-search.component.ts b/src/app/shared/search/themed-search.component.ts
index fe531e4f0f5..a1e06eeed1a 100644
--- a/src/app/shared/search/themed-search.component.ts
+++ b/src/app/shared/search/themed-search.component.ts
@@ -19,7 +19,7 @@ import { ListableObject } from '../object-collection/shared/listable-object.mode
   templateUrl: '../theme-support/themed.component.html',
 })
 export class ThemedSearchComponent extends ThemedComponent<SearchComponent> {
-  protected inAndOutputNames: (keyof SearchComponent & keyof this)[] = ['configurationList', 'context', 'configuration', 'fixedFilterQuery', 'useCachedVersionIfAvailable', 'inPlaceSearch', 'linkType', 'paginationId', 'searchEnabled', 'sideBarWidth', 'searchFormPlaceholder', 'selectable', 'selectionConfig', 'showCsvExport', 'showSidebar', 'showThumbnails', 'showViewModes', 'useUniquePageId', 'viewModeList', 'showScopeSelector', 'resultFound', 'deselectObject', 'selectObject', 'trackStatistics', 'query'];
+  protected inAndOutputNames: (keyof SearchComponent & keyof this)[] = ['configurationList', 'context', 'configuration', 'fixedFilterQuery', 'useCachedVersionIfAvailable', 'inPlaceSearch', 'linkType', 'paginationId', 'searchEnabled', 'sideBarWidth', 'searchFormPlaceholder', 'selectable', 'selectionConfig', 'showCsvExport', 'showSidebar', 'showThumbnails', 'showViewModes', 'useUniquePageId', 'viewModeList', 'showScopeSelector', 'resultFound', 'deselectObject', 'selectObject', 'trackStatistics', 'query', 'retainScrollPosition'];
 
   @Input() configurationList: SearchConfigurationOption[];
 
@@ -65,6 +65,8 @@ export class ThemedSearchComponent extends ThemedComponent<SearchComponent> {
 
   @Input() query: string;
 
+  @Input() retainScrollPosition: boolean;
+
   @Output() resultFound: EventEmitter<SearchObjects<DSpaceObject>> = new EventEmitter();
 
   @Output() deselectObject: EventEmitter<ListableObject> = new EventEmitter();
diff --git a/src/app/shared/sidebar/page-with-sidebar.component.ts b/src/app/shared/sidebar/page-with-sidebar.component.ts
index 63b4a6195c2..3782d498d13 100644
--- a/src/app/shared/sidebar/page-with-sidebar.component.ts
+++ b/src/app/shared/sidebar/page-with-sidebar.component.ts
@@ -32,6 +32,9 @@ export class PageWithSidebarComponent implements OnInit {
   @Input()
   sideBarWidth = 3;
 
+  @Input()
+  retainScrollPosition = false;
+
   /**
    * Observable for whether or not the sidebar is currently collapsed
    */
diff --git a/src/app/shared/testing/router.stub.ts b/src/app/shared/testing/router.stub.ts
index 31bee0b6fe3..e917e6201ed 100644
--- a/src/app/shared/testing/router.stub.ts
+++ b/src/app/shared/testing/router.stub.ts
@@ -3,7 +3,7 @@ export class RouterStub {
   url: string;
   routeReuseStrategy = {shouldReuseRoute: {}};
   //noinspection TypeScriptUnresolvedFunction
-  navigate = jasmine.createSpy('navigate');
+  navigate = jasmine.createSpy('navigate').and.returnValue(Promise.resolve(true));
   parseUrl = jasmine.createSpy('parseUrl');
   events = observableOf({});
   navigateByUrl(url): void {
diff --git a/src/app/shared/testing/scroll-service.stub.ts b/src/app/shared/testing/scroll-service.stub.ts
new file mode 100644
index 00000000000..077d56231fb
--- /dev/null
+++ b/src/app/shared/testing/scroll-service.stub.ts
@@ -0,0 +1,10 @@
+/* eslint-disable no-empty, @typescript-eslint/no-empty-function */
+export class ScrollServiceStub {
+
+  setFragment(fragment: string): void {
+  }
+
+  scrollToActiveFragment(): void {
+  }
+
+}
diff --git a/src/app/shared/view-mode-switch/view-mode-switch.component.ts b/src/app/shared/view-mode-switch/view-mode-switch.component.ts
index 95f35abf175..934e1935118 100644
--- a/src/app/shared/view-mode-switch/view-mode-switch.component.ts
+++ b/src/app/shared/view-mode-switch/view-mode-switch.component.ts
@@ -29,6 +29,11 @@ export class ViewModeSwitchComponent implements OnInit, OnDestroy {
    */
   @Input() viewModeList: ViewMode[];
 
+  /**
+   * Should scroll to the pagination component after updating the route instead of the top of the page
+   */
+  @Input() retainScrollPosition = false;
+
   /**
    * The current view mode
    */
@@ -76,7 +81,7 @@ export class ViewModeSwitchComponent implements OnInit, OnDestroy {
     if (viewMode !== this.currentMode) {
       this.changeViewMode.emit(viewMode);
     }
-    this.searchService.setViewMode(viewMode, this.getSearchLinkParts());
+    this.searchService.setViewMode(viewMode, this.getSearchLinkParts(), this.retainScrollPosition);
   }
 
   ngOnDestroy() {

From 6dd25face88271e0e2705f7f2c1ba1c88241fd6d Mon Sep 17 00:00:00 2001
From: wout <wout.van.damme@atmire.com>
Date: Mon, 22 Sep 2025 10:38:28 +0200
Subject: [PATCH 2/6] 133535: resolve merge conflicts

---
 .../pagination/pagination.service.spec.ts     |  4 ++--
 src/app/core/pagination/pagination.service.ts | 10 ++++++---
 src/app/core/scroll/scroll.service.ts         |  5 ++++-
 .../core/shared/search/search.service.spec.ts |  2 +-
 ...dynamic-lookup-relation-modal.component.ts | 10 ++++++---
 .../page-size-selector.component.ts           |  3 ++-
 .../search-form/search-form.component.spec.ts | 22 ++++++++++---------
 .../search-facet-filter-wrapper.component.ts  |  4 ++--
 .../search-facet-filter.component.spec.ts     | 15 +++++--------
 .../search-facet-filter.component.ts          |  8 +++++--
 .../search-hierarchy-filter.component.spec.ts | 15 +++++++------
 .../search-hierarchy-filter.component.ts      |  4 +---
 .../search-range-filter.component.spec.ts     |  3 +--
 .../search-range-filter.component.ts          |  6 ++---
 .../search-label-loader.component.ts          |  3 +++
 15 files changed, 63 insertions(+), 51 deletions(-)

diff --git a/src/app/core/pagination/pagination.service.spec.ts b/src/app/core/pagination/pagination.service.spec.ts
index 39f4ceb9251..679a93f3408 100644
--- a/src/app/core/pagination/pagination.service.spec.ts
+++ b/src/app/core/pagination/pagination.service.spec.ts
@@ -2,14 +2,14 @@ import { of } from 'rxjs';
 
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { RouterStub } from '../../shared/testing/router.stub';
+import { ScrollServiceStub } from '../../shared/testing/scroll-service.stub';
 import {
   SortDirection,
   SortOptions,
 } from '../cache/models/sort-options.model';
 import { FindListOptions } from '../data/find-list-options.model';
-import { PaginationService } from './pagination.service';
 import { ScrollService } from '../scroll/scroll.service';
-import { ScrollServiceStub } from '../../shared/testing/scroll-service.stub';
+import { PaginationService } from './pagination.service';
 
 
 describe('PaginationService', () => {
diff --git a/src/app/core/pagination/pagination.service.ts b/src/app/core/pagination/pagination.service.ts
index db07ab9d931..7cfe896f036 100644
--- a/src/app/core/pagination/pagination.service.ts
+++ b/src/app/core/pagination/pagination.service.ts
@@ -1,11 +1,15 @@
-import { Injectable, InjectionToken } from '@angular/core';
+import {
+  Injectable,
+  InjectionToken,
+} from '@angular/core';
 import {
   NavigationExtras,
   Router,
 } from '@angular/router';
 import {
+  BehaviorSubject,
   combineLatest as observableCombineLatest,
-  Observable, BehaviorSubject,
+  Observable,
 } from 'rxjs';
 import {
   filter,
@@ -26,9 +30,9 @@ import {
   SortOptions,
 } from '../cache/models/sort-options.model';
 import { FindListOptions } from '../data/find-list-options.model';
+import { ScrollService } from '../scroll/scroll.service';
 import { RouteService } from '../services/route.service';
 import { PaginationRouteParams } from './pagination-route-params.interface';
-import { ScrollService } from '../scroll/scroll.service';
 
 export const RETAIN_SCROLL_POSITION: InjectionToken<BehaviorSubject<any>> = new InjectionToken<boolean>('retainScrollPosition');
 
diff --git a/src/app/core/scroll/scroll.service.ts b/src/app/core/scroll/scroll.service.ts
index 96eaf7388ff..a330aeefb0d 100644
--- a/src/app/core/scroll/scroll.service.ts
+++ b/src/app/core/scroll/scroll.service.ts
@@ -1,5 +1,8 @@
-import { Inject, Injectable } from '@angular/core';
 import { DOCUMENT } from '@angular/common';
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
 
 /**
  * Service used to scroll to a specific fragment/ID on the page
diff --git a/src/app/core/shared/search/search.service.spec.ts b/src/app/core/shared/search/search.service.spec.ts
index a7c7dfece0d..d4ee5c27438 100644
--- a/src/app/core/shared/search/search.service.spec.ts
+++ b/src/app/core/shared/search/search.service.spec.ts
@@ -107,7 +107,7 @@ describe('SearchService', () => {
       service.setViewMode(ViewMode.GridElement);
 
       expect(paginationService.updateRouteWithUrl).toHaveBeenCalledWith(
-        'page-id',
+        'test-id',
         ['/search'],
         { page: 1 },
         { view: ViewMode.GridElement },
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
index a3bc99899aa..0eda0ba5412 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
@@ -1,3 +1,4 @@
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -34,11 +35,16 @@ import { FindListOptions } from '../../../../../core/data/find-list-options.mode
 import { LookupRelationService } from '../../../../../core/data/lookup-relation.service';
 import { PaginatedList } from '../../../../../core/data/paginated-list.model';
 import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
+import { PaginationService } from '../../../../../core/pagination/pagination.service';
 import { Context } from '../../../../../core/shared/context.model';
 import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
 import { ExternalSource } from '../../../../../core/shared/external-source.model';
 import { Item } from '../../../../../core/shared/item.model';
 import { RelationshipType } from '../../../../../core/shared/item-relationships/relationship-type.model';
+import {
+  getAllSucceededRemoteDataPayload,
+  getFirstSucceededRemoteDataPayload,
+} from '../../../../../core/shared/operators';
 import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service';
 import { BtnDisabledDirective } from '../../../../btn-disabled.directive';
@@ -52,6 +58,7 @@ import { ListableObject } from '../../../../object-collection/shared/listable-ob
 import { SelectableListState } from '../../../../object-list/selectable-list/selectable-list.reducer';
 import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
 import { SearchResult } from '../../../../search/models/search-result.model';
+import { followLink } from '../../../../utils/follow-link-config.model';
 import { RelationshipOptions } from '../../models/relationship-options.model';
 import { ThemedDynamicLookupRelationExternalSourceTabComponent } from './external-source-tab/themed-dynamic-lookup-relation-external-source-tab.component';
 import {
@@ -59,9 +66,6 @@ import {
   RemoveRelationshipAction,
   UpdateRelationshipNameVariantAction,
 } from './relationship.actions';
-import { getAllSucceededRemoteDataPayload } from '../../../../../core/shared/operators';
-import { followLink } from '../../../../utils/follow-link-config.model';
-import { PaginationService } from '../../../../../core/pagination/pagination.service';
 import { ThemedDynamicLookupRelationSearchTabComponent } from './search-tab/themed-dynamic-lookup-relation-search-tab.component';
 import { DsDynamicLookupRelationSelectionTabComponent } from './selection-tab/dynamic-lookup-relation-selection-tab.component';
 
diff --git a/src/app/shared/page-size-selector/page-size-selector.component.ts b/src/app/shared/page-size-selector/page-size-selector.component.ts
index 53d817ab1df..b659a4ca389 100644
--- a/src/app/shared/page-size-selector/page-size-selector.component.ts
+++ b/src/app/shared/page-size-selector/page-size-selector.component.ts
@@ -2,7 +2,8 @@ import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Inject,
-  OnInit, Input,
+  Input,
+  OnInit,
 } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import {
diff --git a/src/app/shared/search-form/search-form.component.spec.ts b/src/app/shared/search-form/search-form.component.spec.ts
index 3b9784fbeea..2d3faec7a33 100644
--- a/src/app/shared/search-form/search-form.component.spec.ts
+++ b/src/app/shared/search-form/search-form.component.spec.ts
@@ -11,6 +11,7 @@ import { By } from '@angular/platform-browser';
 import { Router } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
+import { of } from 'rxjs';
 
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { PaginationService } from '../../core/pagination/pagination.service';
@@ -19,35 +20,34 @@ import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { SearchService } from '../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
 import { SearchFilterService } from '../../core/shared/search/search-filter.service';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+import { PaginatedSearchOptions } from '../search/models/paginated-search-options.model';
 import { PaginationServiceStub } from '../testing/pagination-service.stub';
 import { RouterStub } from '../testing/router.stub';
 import { SearchFilterServiceStub } from '../testing/search-filter-service.stub';
 import { SearchServiceStub } from '../testing/search-service.stub';
 import { SearchFormComponent } from './search-form.component';
-import { of as observableOf } from 'rxjs';
-import { PaginatedSearchOptions } from '../search/models/paginated-search-options.model';
-import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 
 describe('SearchFormComponent', () => {
   let comp: SearchFormComponent;
   let fixture: ComponentFixture<SearchFormComponent>;
   let de: DebugElement;
 
-  const mockSearchOptions = observableOf(new PaginatedSearchOptions({
+  const mockSearchOptions = of(new PaginatedSearchOptions({
     pagination: Object.assign(new PaginationComponentOptions(), {
       id: 'test-id',
       pageSize: 10,
-      currentPage: 1
+      currentPage: 1,
     }),
-    scope: 'MCU'
+    scope: 'MCU',
   }));
 
   const router = new RouterStub();
   const searchService = new SearchServiceStub();
   let searchFilterService: SearchFilterServiceStub;
   const paginationService = new PaginationServiceStub();
-  const searchConfigService = { paginationID: 'test-id', paginatedSearchOptions: mockSearchOptions};
+  const searchConfigService = { paginationID: 'test-id', paginatedSearchOptions: mockSearchOptions };
   const firstPage = { 'spc.page': 1 };
   const dspaceObjectService = {
     findById: () => createSuccessfulRemoteDataObject$(undefined),
@@ -127,7 +127,7 @@ describe('SearchFormComponent', () => {
       searchQuery = {};
       comp.updateSearch(searchQuery);
 
-      expect(paginationService.updateRoute).toHaveBeenCalledWith(undefined, {}, {}, false);
+      expect(paginationService.updateRoute).toHaveBeenCalledWith(undefined, {}, { 'spc.page': 1 }, false);
     });
 
     it('should navigate to the search first page with parameters only query if only query is provided', () => {
@@ -137,7 +137,8 @@ describe('SearchFormComponent', () => {
 
       comp.updateSearch(searchQuery);
 
-      expect(paginationService.updateRoute).toHaveBeenCalledWith(undefined, {}, { query: 'THOR' }, false);
+      expect(paginationService.updateRoute).toHaveBeenCalledWith(undefined, {},
+        { 'spc.page': 1, query: 'THOR' }, false);
     });
 
     it('should navigate to the search first page with parameters only query if only scope is provided', () => {
@@ -147,7 +148,8 @@ describe('SearchFormComponent', () => {
 
       comp.updateSearch(searchQuery);
 
-      expect(paginationService.updateRoute).toHaveBeenCalledWith(undefined, {}, { scope: 'MCU' }, false);
+      expect(paginationService.updateRoute).toHaveBeenCalledWith(undefined, {},
+        { 'spc.page': 1, scope: 'MCU' }, false);
     });
   });
 
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts
index 7bdb8006be8..6bd6dca7a7b 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts
@@ -3,7 +3,6 @@ import {
   Input,
 } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
-import { RETAIN_SCROLL_POSITION } from '../../../../../core/pagination/pagination.service';
 
 import { GenericConstructor } from '../../../../../core/shared/generic-constructor';
 import { AbstractComponentLoaderComponent } from '../../../../abstract-component-loader/abstract-component-loader.component';
@@ -43,7 +42,7 @@ export class SearchFacetFilterWrapperComponent extends AbstractComponentLoaderCo
   /**
    * Should scroll to the pagination component after updating the route instead of the top of the page
    */
-  @Input() retainScrollPosition = false;
+  @Input() retainScrollPosition: boolean;
 
   /**
    * The current scope
@@ -58,6 +57,7 @@ export class SearchFacetFilterWrapperComponent extends AbstractComponentLoaderCo
     'filterConfig',
     'inPlaceSearch',
     'refreshFilters',
+    'retainScrollPosition',
     'scope',
   ];
 
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
index 5f9c8c99a31..c4145f187a2 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
@@ -12,17 +12,21 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { Router } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { cold } from 'jasmine-marbles';
+import { PaginationService } from 'ngx-pagination';
 import {
   BehaviorSubject,
   of,
 } from 'rxjs';
 
 import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
+import { RouteService } from '../../../../../core/services/route.service';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
 import { SearchService } from '../../../../../core/shared/search/search.service';
 import { SearchFilterService } from '../../../../../core/shared/search/search-filter.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service';
 import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
+import { PaginationServiceStub } from '../../../../testing/pagination-service.stub';
+import { routeServiceStub } from '../../../../testing/route-service.stub';
 import { RouterStub } from '../../../../testing/router.stub';
 import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub';
 import { SearchFilterServiceStub } from '../../../../testing/search-filter-service.stub';
@@ -32,15 +36,6 @@ import { FacetValues } from '../../../models/facet-values.model';
 import { FilterType } from '../../../models/filter-type.model';
 import { SearchFilterConfig } from '../../../models/search-filter-config.model';
 import { SearchFacetFilterComponent } from './search-facet-filter.component';
-import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
-import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub';
-import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
-import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
-import { RETAIN_SCROLL_POSITION } from '../../../../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../../../testing/pagination-service.stub';
-import { PaginationService } from 'ngx-pagination';
-import { RouteService } from '../../../../../core/services/route.service';
-import { routeServiceStub } from '../../../../testing/route-service.stub';
 
 describe('SearchFacetFilterComponent', () => {
   let comp: SearchFacetFilterComponent;
@@ -115,7 +110,6 @@ describe('SearchFacetFilterComponent', () => {
         { provide: SEARCH_CONFIG_SERVICE, useValue: searchConfigService },
         { provide: RouteService, useValue: routeServiceStub },
         { provide: PaginationService, useValue: new PaginationServiceStub() },
-        { provide: RETAIN_SCROLL_POSITION, useValue: new BehaviorSubject<boolean>(false) },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(SearchFacetFilterComponent, {
@@ -129,6 +123,7 @@ describe('SearchFacetFilterComponent', () => {
     comp.filterConfig = mockFilterConfig;
     comp.inPlaceSearch = false;
     comp.refreshFilters = new BehaviorSubject<boolean>(false);
+    comp.retainScrollPosition = true;
     spyOn(searchService, 'getFacetValuesFor').and.returnValue(createSuccessfulRemoteDataObject$(values));
     fixture.detectChanges();
   });
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
index 4953d11d230..54f18cdb848 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
@@ -32,6 +32,7 @@ import {
 } from 'rxjs/operators';
 
 import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
+import { PaginationService } from '../../../../../core/pagination/pagination.service';
 import { getFirstSucceededRemoteDataPayload } from '../../../../../core/shared/operators';
 import { SearchService } from '../../../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
@@ -46,7 +47,6 @@ import { currentPath } from '../../../../utils/route.utils';
 import { AppliedFilter } from '../../../models/applied-filter.model';
 import { FacetValue } from '../../../models/facet-value.model';
 import { FacetValues } from '../../../models/facet-values.model';
-import { RETAIN_SCROLL_POSITION, PaginationService } from '../../../../../core/pagination/pagination.service';
 import { SearchFilterConfig } from '../../../models/search-filter-config.model';
 import { SearchOptions } from '../../../models/search-options.model';
 
@@ -90,6 +90,11 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
    */
   @Input() scope: string;
 
+  /**
+   * Should scroll to the pagination component after updating the route instead of the top of the page
+   */
+  @Input() retainScrollPosition = false;
+
   /**
    * Emits an array of pages with values found for this facet
    */
@@ -152,7 +157,6 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
               protected rdbs: RemoteDataBuildService,
               protected router: Router,
               @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
-              @Inject(RETAIN_SCROLL_POSITION) protected retainScrollPosition: boolean,
   ) {
   }
 
diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
index b77264875e2..c513b33e910 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
@@ -28,20 +28,19 @@ import { RemoteDataBuildService } from '../../../../../core/cache/builders/remot
 import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../../core/data/remote-data';
 import { RequestEntryState } from '../../../../../core/data/request-entry-state.model';
+import { RouteService } from '../../../../../core/services/route.service';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
 import { SearchService } from '../../../../../core/shared/search/search.service';
 import { SearchFilterService } from '../../../../../core/shared/search/search-filter.service';
 import { VocabularyEntryDetail } from '../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
 import { VocabularyService } from '../../../../../core/submission/vocabularies/vocabulary.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service';
+import { routeServiceStub } from '../../../../testing/route-service.stub';
 import { RouterStub } from '../../../../testing/router.stub';
 import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub';
 import { SearchServiceStub } from '../../../../testing/search-service.stub';
 import { SearchFilterConfig } from '../../../models/search-filter-config.model';
 import { SearchHierarchyFilterComponent } from './search-hierarchy-filter.component';
-import { RETAIN_SCROLL_POSITION } from '../../../../../core/pagination/pagination.service';
-import { routeServiceStub } from '../../../../testing/route-service.stub';
-import { RouteService } from '../../../../../core/services/route.service';
 
 describe('SearchHierarchyFilterComponent', () => {
   let comp: SearchHierarchyFilterComponent;
@@ -93,7 +92,6 @@ describe('SearchHierarchyFilterComponent', () => {
         { provide: APP_CONFIG, useValue: environment },
         { provide: SEARCH_CONFIG_SERVICE, useValue: searchConfigService },
         { provide: RouteService, useValue: routeServiceStub },
-        { provide: RETAIN_SCROLL_POSITION, useValue: new BehaviorSubject<boolean>(false) },
       ],
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
@@ -105,6 +103,7 @@ describe('SearchHierarchyFilterComponent', () => {
     comp.inPlaceSearch = false;
     comp.filterConfig = Object.assign(new SearchFilterConfig(), { name: testSearchFilter });
     comp.refreshFilters = new BehaviorSubject<boolean>(false);
+    comp.retainScrollPosition = true;
     fixture.detectChanges();
     showVocabularyTreeLink = fixture.debugElement.query(By.css(`a#show-${testSearchFilter}-tree`));
   }
@@ -156,12 +155,14 @@ describe('SearchHierarchyFilterComponent', () => {
           expect(modalService.open).toHaveBeenCalled();
           tick();
           expect(searchConfigService.selectNewAppliedFilterParams).toHaveBeenCalled();
-          expect(router.navigate).toHaveBeenCalledWith(['/search'], {
-            queryParams: {
+          expect(router.navigate).toHaveBeenCalledWith(['', 'search'], {
+            queryParams: jasmine.objectContaining({
               [`f.${testSearchFilter}`]: [
                 'definedBy_selectNewAppliedFilterParams',
               ],
-            },
+            }),
+            queryParamsHandling: 'merge',
+            fragment: 'prevent-scroll',
           });
         }));
       });
diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
index cfc6c2e3843..7ff554f0fe6 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
@@ -35,6 +35,7 @@ import {
 } from '../../../../../../config/app-config.interface';
 import { FilterVocabularyConfig } from '../../../../../../config/filter-vocabulary-config';
 import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
+import { PaginationService } from '../../../../../core/pagination/pagination.service';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
 import { SearchService } from '../../../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
@@ -52,7 +53,6 @@ import {
 } from '../search-facet-filter/search-facet-filter.component';
 import { SearchFacetOptionComponent } from '../search-facet-filter-options/search-facet-option/search-facet-option.component';
 import { SearchFacetSelectedOptionComponent } from '../search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component';
-import { RETAIN_SCROLL_POSITION, PaginationService } from '../../../../../core/pagination/pagination.service';
 
 @Component({
   selector: 'ds-search-hierarchy-filter',
@@ -85,7 +85,6 @@ export class SearchHierarchyFilterComponent extends SearchFacetFilterComponent i
               protected vocabularyService: VocabularyService,
               @Inject(APP_CONFIG) protected appConfig: AppConfig,
               @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
-              @Inject(RETAIN_SCROLL_POSITION) protected retainScrollPosition: boolean
   ) {
     super(
       searchService,
@@ -94,7 +93,6 @@ export class SearchHierarchyFilterComponent extends SearchFacetFilterComponent i
       rdbs,
       router,
       searchConfigService,
-      retainScrollPosition,
     );
   }
 
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts
index efe4833e7a4..c1be8777bac 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts
@@ -35,7 +35,6 @@ import { FilterType } from '../../../models/filter-type.model';
 import { SearchFilterConfig } from '../../../models/search-filter-config.model';
 import { SearchFacetRangeOptionComponent } from '../search-facet-filter-options/search-facet-range-option/search-facet-range-option.component';
 import { SearchRangeFilterComponent } from './search-range-filter.component';
-import { RETAIN_SCROLL_POSITION } from '../../../../../core/pagination/pagination.service';
 
 describe('SearchRangeFilterComponent', () => {
   let comp: SearchRangeFilterComponent;
@@ -116,7 +115,6 @@ describe('SearchRangeFilterComponent', () => {
         { provide: RemoteDataBuildService, useValue: { aggregate: () => of({}) } },
         { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
         { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
-        { provide: RETAIN_SCROLL_POSITION, useValue: new BehaviorSubject<boolean>(false) },
       ],
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).overrideComponent(SearchRangeFilterComponent, {
@@ -134,6 +132,7 @@ describe('SearchRangeFilterComponent', () => {
     comp.filterConfig = mockFilterConfig;
     comp.inPlaceSearch = false;
     comp.refreshFilters = new BehaviorSubject<boolean>(false);
+    comp.retainScrollPosition = true;
     spyOn(searchService, 'getFacetValuesFor').and.returnValue(mockValues);
     fixture.detectChanges();
   });
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
index cee9c628fc0..b133bd5fa1a 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
@@ -23,6 +23,7 @@ import {
 import { yearFromString } from 'src/app/shared/date.util';
 
 import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
+import { PaginationService } from '../../../../../core/pagination/pagination.service';
 import { RouteService } from '../../../../../core/services/route.service';
 import { SearchService } from '../../../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
@@ -39,7 +40,6 @@ import {
   RANGE_FILTER_MAX_SUFFIX,
   RANGE_FILTER_MIN_SUFFIX,
 } from './search-range-filter-constants';
-import { RETAIN_SCROLL_POSITION, PaginationService } from '../../../../../core/pagination/pagination.service';
 
 /**
  * This component renders a simple item page.
@@ -117,7 +117,6 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
               private translateService: TranslateService,
               @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
               @Inject(PLATFORM_ID) private platformId: any,
-              @Inject(RETAIN_SCROLL_POSITION) protected retainScrollPosition: boolean,
   ) {
     super(
       searchService,
@@ -126,7 +125,6 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
       rdbs,
       router,
       searchConfigService,
-      retainScrollPosition,
     );
   }
 
@@ -181,7 +179,7 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
     const newMax = this.range[1] !== this.max ? [this.range[1]] : null;
     this.paginationService.updateRouteWithUrl(this.searchConfigService.paginationID, this.getSearchLinkParts(), {}, {
       [this.filterConfig.paramName + RANGE_FILTER_MIN_SUFFIX]: newMin,
-      [this.filterConfig.paramName + RANGE_FILTER_MAX_SUFFIX]: newMax
+      [this.filterConfig.paramName + RANGE_FILTER_MAX_SUFFIX]: newMax,
     }, this.retainScrollPosition);
     this.filter = '';
   }
diff --git a/src/app/shared/search/search-labels/search-label-loader/search-label-loader.component.ts b/src/app/shared/search/search-labels/search-label-loader/search-label-loader.component.ts
index ccb675137f6..f9bb799cd49 100644
--- a/src/app/shared/search/search-labels/search-label-loader/search-label-loader.component.ts
+++ b/src/app/shared/search/search-labels/search-label-loader/search-label-loader.component.ts
@@ -23,6 +23,8 @@ export class SearchLabelLoaderComponent extends AbstractComponentLoaderComponent
 
   @Input() inPlaceSearch: boolean;
 
+  @Input() retainScrollPosition: boolean;
+
   @Input() appliedFilter: AppliedFilter;
 
   protected inputNamesDependentForComponent: (keyof this & string)[] = [
@@ -32,6 +34,7 @@ export class SearchLabelLoaderComponent extends AbstractComponentLoaderComponent
   protected inputNames: (keyof this & string)[] = [
     'inPlaceSearch',
     'appliedFilter',
+    'retainScrollPosition',
   ];
 
   public getComponent(): GenericConstructor<Component> {

From 1f2138fa8089bdcc64c1cc6bb577fe4bc0c5bd1b Mon Sep 17 00:00:00 2001
From: wout <wout.van.damme@atmire.com>
Date: Thu, 6 Nov 2025 13:42:09 +0100
Subject: [PATCH 3/6] 133535: search - check if in pagination context

---
 .../search-form/search-form.component.spec.ts | 30 ++++++++-----------
 .../search-form/search-form.component.ts      | 11 +++++--
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/app/shared/search-form/search-form.component.spec.ts b/src/app/shared/search-form/search-form.component.spec.ts
index 220f3fef2b5..584b7c5584c 100644
--- a/src/app/shared/search-form/search-form.component.spec.ts
+++ b/src/app/shared/search-form/search-form.component.spec.ts
@@ -17,9 +17,6 @@ import { BrowserOnlyMockPipe } from '../testing/browser-only-mock.pipe';
 import { SearchServiceStub } from '../testing/search-service.stub';
 import { Router } from '@angular/router';
 import { RouterStub } from '../testing/router.stub';
-import { of as observableOf } from 'rxjs';
-import { PaginatedSearchOptions } from '../search/models/paginated-search-options.model';
-import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 
 describe('SearchFormComponent', () => {
   let comp: SearchFormComponent;
@@ -27,19 +24,10 @@ describe('SearchFormComponent', () => {
   let de: DebugElement;
   let el: HTMLElement;
 
-  const mockSearchOptions = observableOf(new PaginatedSearchOptions({
-    pagination: Object.assign(new PaginationComponentOptions(), {
-      id: 'test-id',
-      pageSize: 10,
-      currentPage: 1
-    }),
-    scope: 'MCU'
-  }));
-
   const router = new RouterStub();
   const searchService = new SearchServiceStub();
   const paginationService = new PaginationServiceStub();
-  const searchConfigService = { paginationID: 'test-id', paginatedSearchOptions: mockSearchOptions};
+  const searchConfigService = { paginationID: 'test-id' };
   const dspaceObjectService = {
     findById: () => createSuccessfulRemoteDataObject$(undefined),
   };
@@ -117,10 +105,12 @@ describe('SearchFormComponent', () => {
     let searchQuery = {};
 
     it('should navigate to the search page even when no parameters are provided', () => {
-      searchQuery = {};
       comp.updateSearch(searchQuery);
 
-      expect(paginationService.updateRoute).toHaveBeenCalledWith(undefined, {}, {}, false);
+      expect(router.navigate).toHaveBeenCalledWith(comp.getSearchLinkParts(), {
+        queryParams: searchQuery,
+        queryParamsHandling: 'merge'
+      });
     });
 
     it('should navigate to the search page with parameters only query if only query is provided', () => {
@@ -130,7 +120,10 @@ describe('SearchFormComponent', () => {
 
       comp.updateSearch(searchQuery);
 
-      expect(paginationService.updateRoute).toHaveBeenCalledWith(undefined, {}, { query: 'THOR' }, false);
+      expect(router.navigate).toHaveBeenCalledWith(comp.getSearchLinkParts(), {
+        queryParams: searchQuery,
+        queryParamsHandling: 'merge'
+      });
     });
 
     it('should navigate to the search page with parameters only query if only scope is provided', () => {
@@ -140,7 +133,10 @@ describe('SearchFormComponent', () => {
 
       comp.updateSearch(searchQuery);
 
-      expect(paginationService.updateRoute).toHaveBeenCalledWith(undefined, {}, { scope: 'MCU' }, false);
+      expect(router.navigate).toHaveBeenCalledWith(comp.getSearchLinkParts(), {
+        queryParams: searchQuery,
+        queryParamsHandling: 'merge'
+      });
     });
   });
 
diff --git a/src/app/shared/search-form/search-form.component.ts b/src/app/shared/search-form/search-form.component.ts
index 3ca416652e5..10c806825a7 100644
--- a/src/app/shared/search-form/search-form.component.ts
+++ b/src/app/shared/search-form/search-form.component.ts
@@ -1,7 +1,7 @@
 import { Component, EventEmitter, Input, Output, OnChanges } from '@angular/core';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { Router } from '@angular/router';
-import { isNotEmpty } from '../empty.util';
+import { isNotEmpty, hasValue } from '../empty.util';
 import { SearchService } from '../../core/shared/search/search.service';
 import { currentPath } from '../utils/route.utils';
 import { PaginationService } from '../../core/pagination/pagination.service';
@@ -121,7 +121,14 @@ export class SearchFormComponent implements OnChanges {
   updateSearch(data: any) {
     const queryParams = Object.assign({}, data);
 
-    this.paginationService.updateRoute(this.searchConfig.paginatedSearchOptions?.value?.pagination?.id, {}, queryParams, this.retainScrollPosition);
+    if (hasValue(this.searchConfig.paginatedSearchOptions?.value?.pagination?.id) && this.retainScrollPosition) {
+      this.paginationService.updateRoute(this.searchConfig.paginatedSearchOptions?.value?.pagination?.id, {}, queryParams, this.retainScrollPosition);
+    } else {
+      void this.router.navigate(this.getSearchLinkParts(), {
+        queryParams: queryParams,
+        queryParamsHandling: 'merge'
+      });
+    }
   }
 
   /**

From 0a6652781a2bfc1f1a51ce962b5749757f138ee7 Mon Sep 17 00:00:00 2001
From: wout <wout.van.damme@atmire.com>
Date: Thu, 13 Nov 2025 13:25:30 +0100
Subject: [PATCH 4/6] 133535: resolve conflict

---
 src/app/shared/search-form/search-form.component.ts |  2 +-
 .../search-facet-filter.component.spec.ts           | 13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/app/shared/search-form/search-form.component.ts b/src/app/shared/search-form/search-form.component.ts
index 0874f727f8a..33532e30e3d 100644
--- a/src/app/shared/search-form/search-form.component.ts
+++ b/src/app/shared/search-form/search-form.component.ts
@@ -169,7 +169,7 @@ export class SearchFormComponent implements OnChanges {
     } else {
       void this.router.navigate(this.getSearchLinkParts(), {
         queryParams: queryParams,
-        queryParamsHandling: 'merge'
+        queryParamsHandling: 'merge',
       });
     }
   }
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
index 624f54cd56a..c4145f187a2 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
@@ -10,17 +10,6 @@ import {
 import { FormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { Router } from '@angular/router';
-import { RemoteDataBuildService } from '@dspace/core/cache/builders/remote-data-build.service';
-import { PageInfo } from '@dspace/core/shared/page-info.model';
-import { AppliedFilter } from '@dspace/core/shared/search/models/applied-filter.model';
-import { FacetValues } from '@dspace/core/shared/search/models/facet-values.model';
-import { FilterType } from '@dspace/core/shared/search/models/filter-type.model';
-import { SearchFilterConfig } from '@dspace/core/shared/search/models/search-filter-config.model';
-import { RouterStub } from '@dspace/core/testing/router.stub';
-import { SearchConfigurationServiceStub } from '@dspace/core/testing/search-configuration-service.stub';
-import { SearchFilterServiceStub } from '@dspace/core/testing/search-filter-service.stub';
-import { SearchServiceStub } from '@dspace/core/testing/search-service.stub';
-import { createSuccessfulRemoteDataObject$ } from '@dspace/core/utilities/remote-data.utils';
 import { TranslateModule } from '@ngx-translate/core';
 import { cold } from 'jasmine-marbles';
 import { PaginationService } from 'ngx-pagination';
@@ -35,8 +24,6 @@ import { PageInfo } from '../../../../../core/shared/page-info.model';
 import { SearchService } from '../../../../../core/shared/search/search.service';
 import { SearchFilterService } from '../../../../../core/shared/search/search-filter.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service';
-import { SearchService } from '../../../search.service';
-import { SearchFilterService } from '../../search-filter.service';
 import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
 import { PaginationServiceStub } from '../../../../testing/pagination-service.stub';
 import { routeServiceStub } from '../../../../testing/route-service.stub';

From bf55ca39b28dbf6cb7e3ef715655bc74998b9a54 Mon Sep 17 00:00:00 2001
From: wout <wout.van.damme@atmire.com>
Date: Thu, 13 Nov 2025 13:36:26 +0100
Subject: [PATCH 5/6] 133535: fix imports

---
 .../pagination/pagination.service.spec.ts     |  4 +--
 ...dynamic-lookup-relation-modal.component.ts |  2 +-
 .../search-facet-filter.component.spec.ts     | 26 +++++++++----------
 .../search-hierarchy-filter.component.spec.ts |  4 +--
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/app/core/pagination/pagination.service.spec.ts b/src/app/core/pagination/pagination.service.spec.ts
index 60e5908de41..74656eb5f30 100644
--- a/src/app/core/pagination/pagination.service.spec.ts
+++ b/src/app/core/pagination/pagination.service.spec.ts
@@ -1,3 +1,4 @@
+import { ScrollServiceStub } from '@dspace/core/testing/scroll-service.stub';
 import { of } from 'rxjs';
 
 import {
@@ -5,11 +6,10 @@ import {
   SortOptions,
 } from '../cache/models/sort-options.model';
 import { FindListOptions } from '../data/find-list-options.model';
+import { ScrollService } from '../scroll/scroll.service';
 import { RouterStub } from '../testing/router.stub';
 import { PaginationService } from './pagination.service';
 import { PaginationComponentOptions } from './pagination-component-options.model';
-import { ScrollService } from '../scroll/scroll.service';
-import { ScrollServiceStub } from '../../shared/testing/scroll-service.stub';
 
 
 describe('PaginationService', () => {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
index fe966e8126d..8d3e9278bdf 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
@@ -13,6 +13,7 @@ import { RequestParam } from '@dspace/core/cache/models/request-param.model';
 import { ExternalSourceDataService } from '@dspace/core/data/external-source-data.service';
 import { FindListOptions } from '@dspace/core/data/find-list-options.model';
 import { PaginatedList } from '@dspace/core/data/paginated-list.model';
+import { PaginationService } from '@dspace/core/pagination/pagination.service';
 import { Context } from '@dspace/core/shared/context.model';
 import { DSpaceObject } from '@dspace/core/shared/dspace-object.model';
 import { ExternalSource } from '@dspace/core/shared/external-source.model';
@@ -67,7 +68,6 @@ import {
 } from './relationship.actions';
 import { ThemedDynamicLookupRelationSearchTabComponent } from './search-tab/themed-dynamic-lookup-relation-search-tab.component';
 import { DsDynamicLookupRelationSelectionTabComponent } from './selection-tab/dynamic-lookup-relation-selection-tab.component';
-import { PaginationService } from 'ngx-pagination';
 
 @Component({
   selector: 'ds-dynamic-lookup-relation-modal',
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
index c4145f187a2..79d643572b4 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
@@ -10,6 +10,17 @@ import {
 import { FormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { Router } from '@angular/router';
+import { AppliedFilter } from '@dspace/core/shared/search/models/applied-filter.model';
+import { FacetValues } from '@dspace/core/shared/search/models/facet-values.model';
+import { FilterType } from '@dspace/core/shared/search/models/filter-type.model';
+import { SearchFilterConfig } from '@dspace/core/shared/search/models/search-filter-config.model';
+import { PaginationServiceStub } from '@dspace/core/testing/pagination-service.stub';
+import { routeServiceStub } from '@dspace/core/testing/route-service.stub';
+import { RouterStub } from '@dspace/core/testing/router.stub';
+import { SearchConfigurationServiceStub } from '@dspace/core/testing/search-configuration-service.stub';
+import { SearchFilterServiceStub } from '@dspace/core/testing/search-filter-service.stub';
+import { SearchServiceStub } from '@dspace/core/testing/search-service.stub';
+import { createSuccessfulRemoteDataObject$ } from '@dspace/core/utilities/remote-data.utils';
 import { TranslateModule } from '@ngx-translate/core';
 import { cold } from 'jasmine-marbles';
 import { PaginationService } from 'ngx-pagination';
@@ -21,20 +32,9 @@ import {
 import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
 import { RouteService } from '../../../../../core/services/route.service';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
-import { SearchService } from '../../../../../core/shared/search/search.service';
-import { SearchFilterService } from '../../../../../core/shared/search/search-filter.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service';
-import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
-import { PaginationServiceStub } from '../../../../testing/pagination-service.stub';
-import { routeServiceStub } from '../../../../testing/route-service.stub';
-import { RouterStub } from '../../../../testing/router.stub';
-import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub';
-import { SearchFilterServiceStub } from '../../../../testing/search-filter-service.stub';
-import { SearchServiceStub } from '../../../../testing/search-service.stub';
-import { AppliedFilter } from '../../../models/applied-filter.model';
-import { FacetValues } from '../../../models/facet-values.model';
-import { FilterType } from '../../../models/filter-type.model';
-import { SearchFilterConfig } from '../../../models/search-filter-config.model';
+import { SearchService } from '../../../search.service';
+import { SearchFilterService } from '../../search-filter.service';
 import { SearchFacetFilterComponent } from './search-facet-filter.component';
 
 describe('SearchFacetFilterComponent', () => {
diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
index 8d5611fa77b..adcc10e7309 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
@@ -21,6 +21,7 @@ import { PageInfo } from '@dspace/core/shared/page-info.model';
 import { SearchFilterConfig } from '@dspace/core/shared/search/models/search-filter-config.model';
 import { VocabularyEntryDetail } from '@dspace/core/submission/vocabularies/models/vocabulary-entry-detail.model';
 import { VocabularyService } from '@dspace/core/submission/vocabularies/vocabulary.service';
+import { routeServiceStub } from '@dspace/core/testing/route-service.stub';
 import { RouterStub } from '@dspace/core/testing/router.stub';
 import { SearchConfigurationServiceStub } from '@dspace/core/testing/search-configuration-service.stub';
 import { SearchServiceStub } from '@dspace/core/testing/search-service.stub';
@@ -35,12 +36,11 @@ import {
 } from 'rxjs';
 
 import { environment } from '../../../../../../environments/environment.test';
+import { RouteService } from '../../../../../core/services/route.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service';
-import { routeServiceStub } from '../../../../testing/route-service.stub';
 import { SearchService } from '../../../search.service';
 import { SearchFilterService } from '../../search-filter.service';
 import { SearchHierarchyFilterComponent } from './search-hierarchy-filter.component';
-import { RouteService } from '../../../../../core/services/route.service';
 
 describe('SearchHierarchyFilterComponent', () => {
   let comp: SearchHierarchyFilterComponent;

From 12a9350fb837e8fd37b7d8d4ccb59266ceb533dc Mon Sep 17 00:00:00 2001
From: wout <wout.van.damme@atmire.com>
Date: Thu, 13 Nov 2025 13:58:27 +0100
Subject: [PATCH 6/6] 133535: lint fix

---
 src/app/core/pagination/pagination.service.ts                   | 2 +-
 .../search-facet-filter/search-facet-filter.component.ts        | 1 +
 .../search-hierarchy-filter.component.ts                        | 1 +
 .../search-range-filter/search-range-filter.component.ts        | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/app/core/pagination/pagination.service.ts b/src/app/core/pagination/pagination.service.ts
index faf0367665a..78b1b22bd06 100644
--- a/src/app/core/pagination/pagination.service.ts
+++ b/src/app/core/pagination/pagination.service.ts
@@ -14,9 +14,9 @@ import {
 import { isNumeric } from '@dspace/shared/utils/numeric.util';
 import { difference } from '@dspace/shared/utils/object.util';
 import {
+  BehaviorSubject,
   combineLatest as observableCombineLatest,
   Observable,
-  BehaviorSubject,
 } from 'rxjs';
 import {
   filter,
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
index 67ff221d913..c20a0fb1546 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
@@ -42,6 +42,7 @@ import {
   take,
   tap,
 } from 'rxjs/operators';
+
 import { PaginationService } from '../../../../../core/pagination/pagination.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service';
 import { InputSuggestion } from '../../../../input-suggestions/input-suggestions.model';
diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
index b6a3bc594a3..02030fb64ba 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
@@ -38,6 +38,7 @@ import {
   switchMap,
   take,
 } from 'rxjs/operators';
+
 import { PaginationService } from '../../../../../core/pagination/pagination.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service';
 import { VocabularyTreeviewModalComponent } from '../../../../form/vocabulary-treeview-modal/vocabulary-treeview-modal.component';
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
index 3879664bac1..4869588dbe8 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
@@ -24,6 +24,7 @@ import {
   map,
   startWith,
 } from 'rxjs/operators';
+
 import { PaginationService } from '../../../../../core/pagination/pagination.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service';
 import { DebounceDirective } from '../../../../utils/debounce.directive';