From bb8453417c270d85f8ea79acce849764864fab53 Mon Sep 17 00:00:00 2001
From: JPeer264 <jan.oster94@gmail.com>
Date: Mon, 14 Apr 2025 17:04:17 +0200
Subject: [PATCH 1/2] fix safari sidebar overflow

Signed-off-by: JPeer264 <jan.oster94@gmail.com>
---
 .changeset/real-sheep-chew.md                    |  5 +++++
 .../core-components/src/layout/Sidebar/Bar.tsx   | 16 +++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 .changeset/real-sheep-chew.md

diff --git a/.changeset/real-sheep-chew.md b/.changeset/real-sheep-chew.md
new file mode 100644
index 0000000000..7ff56e5fc1
--- /dev/null
+++ b/.changeset/real-sheep-chew.md
@@ -0,0 +1,5 @@
+---
+'@backstage/core-components': minor
+---
+
+Fix the hidden sidebar's submenu when the sidebar is scrollable
diff --git a/packages/core-components/src/layout/Sidebar/Bar.tsx b/packages/core-components/src/layout/Sidebar/Bar.tsx
index a73c0375cd..00fe6f96ae 100644
--- a/packages/core-components/src/layout/Sidebar/Bar.tsx
+++ b/packages/core-components/src/layout/Sidebar/Bar.tsx
@@ -41,15 +41,21 @@ import { coreComponentsTranslationRef } from '../../translation';
 export type SidebarClassKey = 'drawer' | 'drawerOpen';
 const useStyles = makeStyles<Theme, { sidebarConfig: SidebarConfig }>(
   theme => ({
-    drawer: {
-      display: 'flex',
-      flexFlow: 'column nowrap',
-      alignItems: 'flex-start',
-      position: 'fixed',
+    root: {
       left: 0,
       top: 0,
       bottom: 0,
       zIndex: theme.zIndex.appBar,
+      position: 'fixed',
+    },
+    drawer: {
+      display: 'flex',
+      flexFlow: 'column nowrap',
+      alignItems: 'flex-start',
+      left: 0,
+      top: 0,
+      bottom: 0,
+      position: 'absolute',
       background: theme.palette.navigation.background,
       overflowX: 'hidden',
       msOverflowStyle: 'none',

From c8af9664f677eb456c5812e2065c8d97a6e29f21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Thu, 24 Apr 2025 09:58:54 +0200
Subject: [PATCH 2/2] Update .changeset/real-sheep-chew.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .changeset/real-sheep-chew.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.changeset/real-sheep-chew.md b/.changeset/real-sheep-chew.md
index 7ff56e5fc1..9ae5b5ae9e 100644
--- a/.changeset/real-sheep-chew.md
+++ b/.changeset/real-sheep-chew.md
@@ -1,5 +1,5 @@
 ---
-'@backstage/core-components': minor
+'@backstage/core-components': patch
 ---
 
-Fix the hidden sidebar's submenu when the sidebar is scrollable
+Fix the hidden sidebar's sub-menu when the sidebar is scrollable