diff --git a/src/assets/styles/pages/configuration/_main.scss b/src/assets/styles/pages/configuration/_main.scss
index fe31eb5..93022cd 100644
--- a/src/assets/styles/pages/configuration/_main.scss
+++ b/src/assets/styles/pages/configuration/_main.scss
@@ -19,8 +19,10 @@
     var(--theme-bg)
   );
 
+  --config-heading-height: 2rem;
+  --config-padding-top: 1.75rem;
+
   .p-dialog-content {
-    padding-top: 1.75rem;
     display: flex;
     width: 40rem;
     max-width: 100%;
@@ -34,6 +36,7 @@
     position: sticky;
     top: 0;
     z-index: 1;
+    padding-top: var(--config-padding-top);
   }
 
   ul {
@@ -75,11 +78,10 @@
   .content {
     flex-grow: 1;
     min-width: 0;
-    overflow-y: scroll;
+    align-self: flex-start;
 
     > :first-child {
       margin-top: 0;
-      margin-bottom: 0.4rem;
     }
 
     h1,
@@ -93,7 +95,16 @@
     }
 
     h2 {
-      margin-bottom: 0;
+      position: sticky;
+      top: 0;
+      z-index: 2;
+      display: flex;
+      align-items: center;
+      box-sizing: border-box;
+      height: calc(var(--config-padding-top) + var(--config-heading-height));
+      padding-top: var(--config-padding-top);
+      margin-block: 0;
+      background-color: var(--p-dialog-background);
       font-size: 1.1rem;
     }
 
diff --git a/src/components/configuration/ModelsConfiguration.vue b/src/components/configuration/ModelsConfiguration.vue
index ec840e6..76a0f22 100644
--- a/src/components/configuration/ModelsConfiguration.vue
+++ b/src/components/configuration/ModelsConfiguration.vue
@@ -1,32 +1,32 @@
 <template>
   <h2>Models</h2>
-  <div class="models-content">
-    <div class="models-header">
-      <BaseInput v-model="filter" placeholder="Search models..." />
-      <div class="models-sub-header">
-        <select
-          v-model="filterByProvider"
-          :options="filterByProviderOptions"
-          class="filter-by-provider"
-        >
-          <option
-            v-for="option in filterByProviderOptions"
-            :value="option.value"
-          >
-            {{ option.label }}
-          </option>
-        </select>
-        <button
-          @click="refreshModels"
-          v-show="supportsRuntimeModels"
-          class="btn btn-flat"
-          :disabled="disableRefreshModelsBtn"
+  <div class="models-header">
+    <BaseInput v-model="filter" placeholder="Search models..." />
+    <div class="models-sub-header">
+      <select
+        v-model="filterByProvider"
+        :options="filterByProviderOptions"
+        class="filter-by-provider"
+      >
+        <option
+          v-for="option in filterByProviderOptions"
+          :value="option.value"
         >
-          <span class="material-symbols-outlined">refresh</span>
-          Refresh models
-        </button>
-      </div>
+          {{ option.label }}
+        </option>
+      </select>
+      <button
+        @click="refreshModels"
+        v-show="supportsRuntimeModels"
+        class="btn btn-flat"
+        :disabled="disableRefreshModelsBtn"
+      >
+        <span class="material-symbols-outlined">refresh</span>
+        Refresh models
+      </button>
     </div>
+  </div>
+  <div class="models-content">
     <template v-if="filterByProvider === 'openaiCompat'">
       <div
         v-for="(error, index) in openAiCompatibleErrors"
@@ -257,7 +257,7 @@ export default {
 <style scoped>
 .models-header {
   position: sticky;
-  top: -1px;
+  top: calc(var(--config-padding-top) + var(--config-heading-height));
   background: var(--p-dialog-background);
   z-index: 1;
   padding-bottom: 0.4rem;