diff --git a/projects/observability/src/pages/explorer/explorer.component.scss b/projects/observability/src/pages/explorer/explorer.component.scss
index 1b05a8a98..81c153736 100644
--- a/projects/observability/src/pages/explorer/explorer.component.scss
+++ b/projects/observability/src/pages/explorer/explorer.component.scss
@@ -1,4 +1,5 @@
 @import 'font';
+@import 'layout';
 
 .explorer {
   display: flex;
@@ -11,21 +12,19 @@
   }
 
   .explorer-content {
+    @include scrollable-container(24px);
     display: flex;
     flex-direction: column;
-    padding: 24px 24px 0;
-    flex: 1;
-    min-height: 0;
   }
 
   .explorer-data-toggle {
     flex: 0;
-    padding-bottom: 16px;
+    padding: 24px 24px 16px;
   }
 
   .explorer-filter-bar {
     flex: 0;
-    padding-bottom: 8px;
+    padding: 0 24px 8px;
   }
 
   .panel-title {
@@ -49,14 +48,9 @@
 
   .results-panel {
     flex: 1;
-    overflow: hidden;
 
     .label {
       @include body-1-medium;
     }
-
-    .results-panel-content {
-      padding-top: 12px;
-    }
   }
 }
diff --git a/projects/observability/src/pages/explorer/explorer.component.ts b/projects/observability/src/pages/explorer/explorer.component.ts
index 97ba4012c..08a095eb7 100644
--- a/projects/observability/src/pages/explorer/explorer.component.ts
+++ b/projects/observability/src/pages/explorer/explorer.component.ts
@@ -23,21 +23,20 @@ import {
   template: `
     <div class="explorer">
       <ht-page-header class="explorer-header"></ht-page-header>
+      <ht-toggle-group
+        class="explorer-data-toggle"
+        [items]="this.contextItems"
+        [activeItem]="this.activeContextItem$ | async"
+        (activeItemChange)="this.onContextUpdated($event.value)"
+      ></ht-toggle-group>
+
+      <ht-filter-bar
+        class="explorer-filter-bar"
+        [attributes]="this.attributes$ | async"
+        [syncWithUrl]="true"
+        (filtersChange)="this.onFiltersUpdated($event)"
+      ></ht-filter-bar>
       <div class="explorer-content">
-        <ht-toggle-group
-          class="explorer-data-toggle"
-          [items]="this.contextItems"
-          [activeItem]="this.activeContextItem$ | async"
-          (activeItemChange)="this.onContextUpdated($event.value)"
-        ></ht-toggle-group>
-
-        <ht-filter-bar
-          class="explorer-filter-bar"
-          [attributes]="this.attributes$ | async"
-          [syncWithUrl]="true"
-          (filtersChange)="this.onFiltersUpdated($event)"
-        ></ht-filter-bar>
-
         <ht-panel class="visualization-panel" [(expanded)]="this.visualizationExpanded">
           <ht-panel-header>
             <ht-panel-title [expanded]="this.visualizationExpanded"