diff --git a/app/client/packages/design-system/widgets/src/components/Sidebar/src/SidebarContent.tsx b/app/client/packages/design-system/widgets/src/components/Sidebar/src/SidebarContent.tsx
index 7f88187391f..9c88ff3cf81 100644
--- a/app/client/packages/design-system/widgets/src/components/Sidebar/src/SidebarContent.tsx
+++ b/app/client/packages/design-system/widgets/src/components/Sidebar/src/SidebarContent.tsx
@@ -46,6 +46,7 @@ const _SidebarContent = (
           )}
           {!isMobile && (
             <Button
+              className={styles.sidebarHeaderExpandButton}
               color="neutral"
               icon={
                 state === "full-width"
diff --git a/app/client/packages/design-system/widgets/src/components/Sidebar/src/styles.module.css b/app/client/packages/design-system/widgets/src/components/Sidebar/src/styles.module.css
index 13eef6e4768..0b51b7d0547 100644
--- a/app/client/packages/design-system/widgets/src/components/Sidebar/src/styles.module.css
+++ b/app/client/packages/design-system/widgets/src/components/Sidebar/src/styles.module.css
@@ -152,7 +152,6 @@
 .sidebarContentInner {
   flex-grow: 1;
   overflow-y: auto;
-  overflow-x: hidden;
   width: 100%;
 }
 
@@ -163,13 +162,22 @@
  */
 .sidebarHeader {
   height: var(--sizing-13);
+  min-height: var(--sizing-13);
   padding: 0 var(--inner-spacing-2);
   border-bottom: var(--border-width-1) solid var(--color-bd-elevation-1);
 }
 
+.sidebarHeader:empty {
+  display: none;
+}
+
 .sidebarTitle {
   position: absolute;
   left: 0;
   right: 0;
   margin: 0 var(--sizing-14);
 }
+
+.sidebarHeaderExpandButton {
+  margin-inline-start: auto;
+}