diff --git a/packages/builder/src/components/design/Panel.svelte b/packages/builder/src/components/design/Panel.svelte
index 3d5938c174..c0b752d013 100644
--- a/packages/builder/src/components/design/Panel.svelte
+++ b/packages/builder/src/components/design/Panel.svelte
@@ -11,6 +11,7 @@
   export let onClickCloseButton
   export let borderLeft = false
   export let borderRight = false
+  export let borderBottomHeader = true
   export let wide = false
   export let extraWide = false
   export let closeButtonIcon = "Close"
@@ -26,7 +27,11 @@
   class:borderLeft
   class:borderRight
 >
-  <div class="header" class:custom={customHeaderContent}>
+  <div
+    class="header"
+    class:custom={customHeaderContent}
+    class:borderBottom={borderBottomHeader}
+  >
     {#if showBackButton}
       <Icon name="ArrowLeft" hoverable on:click={onClickBackButton} />
     {/if}
@@ -94,9 +99,11 @@
     justify-content: space-between;
     align-items: center;
     padding: 0 var(--spacing-l);
-    border-bottom: var(--border-light);
     gap: var(--spacing-m);
   }
+  .header.borderBottom {
+    border-bottom: var(--border-light);
+  }
   .title {
     flex: 1 1 auto;
     width: 0;
diff --git a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte
index 3fbf18eac5..7dea0078fd 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte
@@ -21,7 +21,7 @@
 <!-- routify:options index=1 -->
 <div class="data">
   {#if !$isActive("./new")}
-    <Panel borderRight>
+    <Panel borderRight borderBottomHeader={false}>
       <span class="panel-title-content" slot="panel-title-content">
         <NavHeader
           title="Sources"
@@ -30,7 +30,7 @@
           onAdd={() => $goto("./new")}
         />
       </span>
-      <Layout paddingX="L" paddingY="XL" gap="S">
+      <Layout paddingX="L" paddingY="none" gap="S">
         <DatasourceNavigator searchTerm={searchValue} />
       </Layout>
     </Panel>