diff --git a/modules/drawers/Drawers.qml b/modules/drawers/Drawers.qml
index c1d684f2..5211fdcf 100644
--- a/modules/drawers/Drawers.qml
+++ b/modules/drawers/Drawers.qml
@@ -156,6 +156,7 @@ Variants {
                     bar: bar
                     deformAmount: 0.25
                     x: panels.sessionWrapper.x + panels.session.x + bar.implicitWidth
+                    implicitWidth: panels.session.width
                 }
 
                 PanelBg {
@@ -175,6 +176,7 @@ Variants {
                     bar: bar
                     deformAmount: 0.3
                     x: panels.osdWrapper.x + panels.osd.x + bar.implicitWidth
+                    implicitWidth: panels.osd.width
                 }
 
                 PanelBg {
diff --git a/modules/drawers/Interactions.qml b/modules/drawers/Interactions.qml
index c906b9d1..fbf8ccad 100644
--- a/modules/drawers/Interactions.qml
+++ b/modules/drawers/Interactions.qml
@@ -102,7 +102,7 @@ CustomMouseArea {
                 visibilities.bar = false;
         }
 
-        if (panels.sidebar.anchors.rightMargin === -panels.sidebar.implicitWidth - 5) {
+        if (panels.sidebar.offsetScale === 1) {
             // Show osd on hover
             const showOsd = inRightPanel(panels.osdWrapper, x, y);
 
diff --git a/modules/drawers/Panels.qml b/modules/drawers/Panels.qml
index 15140103..01144d09 100644
--- a/modules/drawers/Panels.qml
+++ b/modules/drawers/Panels.qml
@@ -44,7 +44,7 @@ Item {
         anchors.rightMargin: sessionWrapper.anchors.rightMargin + session.width * (1 - session.offsetScale)
         clip: sidebar.visible || session.visible
 
-        implicitWidth: osd.implicitWidth
+        implicitWidth: osd.implicitWidth * (1 - osd.offsetScale)
         implicitHeight: osd.implicitHeight
 
         Osd.Wrapper {
@@ -64,8 +64,8 @@ Item {
 
         visibilities: root.visibilities
         sidebarPanel: sidebar
-        osdPanel: osd
-        sessionPanel: session
+        osdPanel: osdWrapper
+        sessionPanel: sessionWrapper
 
         anchors.top: parent.top
         anchors.right: parent.right
@@ -79,7 +79,7 @@ Item {
         anchors.rightMargin: sidebar.width * (1 - sidebar.offsetScale)
         clip: sidebar.visible
 
-        implicitWidth: session.implicitWidth
+        implicitWidth: session.implicitWidth * (1 - session.offsetScale)
         implicitHeight: session.implicitHeight
 
         Session.Wrapper {