diff --git a/panel/lab/components/headers/index.vue b/panel/lab/components/headers/index.vue
index 75a3163ae9..608a91c03c 100644
--- a/panel/lab/components/headers/index.vue
+++ b/panel/lab/components/headers/index.vue
@@ -15,5 +15,16 @@
 				</k-button-group>
 			</k-header>
 		</k-lab-example>
+		<k-lab-example label="long title & many buttons">
+			<k-header :editable="true">
+				This is a rather long title that still should not cause any issues
+				<k-button-group slot="buttons">
+					<k-button icon="open" variant="filled" />
+					<k-button icon="cog" variant="filled" />
+					<k-button icon="heart" text="Favorite" variant="filled" />
+					<k-button icon="star" text="Bookmark" variant="filled" />
+				</k-button-group>
+			</k-header>
+		</k-lab-example>
 	</k-lab-examples>
 </template>
diff --git a/panel/src/components/Layout/Header.vue b/panel/src/components/Layout/Header.vue
index 9af5d378df..0007354ba0 100644
--- a/panel/src/components/Layout/Header.vue
+++ b/panel/src/components/Layout/Header.vue
@@ -71,6 +71,7 @@ export default {
 	flex-wrap: wrap;
 	align-items: baseline;
 	justify-content: space-between;
+	column-gap: var(--spacing-3);
 	border-bottom: 1px solid var(--color-border);
 	background: var(--header-color-back);
 	padding-top: var(--header-padding-block);
@@ -123,7 +124,6 @@ export default {
 
 .k-header-buttons {
 	display: flex;
-	flex-shrink: 0;
 	gap: var(--spacing-2);
 	margin-bottom: var(--header-padding-block);
 }