diff --git a/projects/components/src/popover/popover.service.ts b/projects/components/src/popover/popover.service.ts
index b1aaf8cb1..2ed30ba9d 100644
--- a/projects/components/src/popover/popover.service.ts
+++ b/projects/components/src/popover/popover.service.ts
@@ -26,6 +26,7 @@ export class PopoverService {
       positionStrategy: initialPositionStrategy,
       hasBackdrop: this.hasBackdrop(options.backdrop),
       backdropClass: this.getBackdropClass(options.backdrop),
+      scrollStrategy: this.overlay.scrollStrategies.reposition(),
     });
 
     const popoverRef = new PopoverRef(overlayRef, this.positionBuilder, this.navigationService);
diff --git a/projects/observability/src/shared/dashboard/dashboard-wrapper/application-aware-dashboard.component.ts b/projects/observability/src/shared/dashboard/dashboard-wrapper/application-aware-dashboard.component.ts
index 47bcf6cff..049b8e2d2 100644
--- a/projects/observability/src/shared/dashboard/dashboard-wrapper/application-aware-dashboard.component.ts
+++ b/projects/observability/src/shared/dashboard/dashboard-wrapper/application-aware-dashboard.component.ts
@@ -11,7 +11,7 @@ import { GraphQlFilterDataSourceModel } from '../data/graphql/filter/graphql-fil
   styleUrls: ['./application-aware-dashboard.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   template: `
-    <div class="application-aware-dashboard" [style.padding.px]="this.padding">
+    <div class="application-aware-dashboard" [style.padding.px]="this.padding" cdk-scrollable>
       <hda-dashboard
         *ngIf="this.json"
         [json]="this.json"
diff --git a/projects/observability/src/shared/dashboard/dashboard-wrapper/navigable-dashboard.module.ts b/projects/observability/src/shared/dashboard/dashboard-wrapper/navigable-dashboard.module.ts
index e164bd46a..02146d43f 100644
--- a/projects/observability/src/shared/dashboard/dashboard-wrapper/navigable-dashboard.module.ts
+++ b/projects/observability/src/shared/dashboard/dashboard-wrapper/navigable-dashboard.module.ts
@@ -6,11 +6,19 @@ import { ModelJson } from '@hypertrace/hyperdash';
 import { DashboardCoreModule, DashboardEditorModule } from '@hypertrace/hyperdash-angular';
 import { ApplicationAwareDashboardComponent } from './application-aware-dashboard.component';
 import { NavigableDashboardComponent } from './navigable-dashboard.component';
+import { ScrollingModule } from '@angular/cdk/scrolling';
 
 const DEFAULT_DASHBOARDS = new InjectionToken<DashboardDefaultConfiguration[]>('DEFAULT_DASHBOARDS');
 
 @NgModule({
-  imports: [CommonModule, DashboardCoreModule, DashboardEditorModule, LoadAsyncModule, FilterBarModule],
+  imports: [
+    CommonModule,
+    DashboardCoreModule,
+    DashboardEditorModule,
+    LoadAsyncModule,
+    FilterBarModule,
+    ScrollingModule,
+  ],
   declarations: [ApplicationAwareDashboardComponent, NavigableDashboardComponent],
   providers: [{ provide: DEFAULT_DASHBOARDS, useValue: [], multi: true }],
   exports: [ApplicationAwareDashboardComponent, NavigableDashboardComponent],