diff --git a/modules/drawers/Drawers.qml b/modules/drawers/Drawers.qml
index 648e280c..858a47dc 100644
--- a/modules/drawers/Drawers.qml
+++ b/modules/drawers/Drawers.qml
@@ -122,25 +122,32 @@ Variants {
                 panels: panels
                 bar: bar
 
-                Panels {
-                    id: panels
+                // FIXME: remove when Hyprland bug fixed
+                Item {
+                    anchors.fill: parent
+                    anchors.rightMargin: 1
+                    anchors.bottomMargin: 1
 
-                    screen: scope.modelData
-                    visibilities: visibilities
-                    bar: bar
-                }
+                    Panels {
+                        id: panels
 
-                BarWrapper {
-                    id: bar
+                        screen: scope.modelData
+                        visibilities: visibilities
+                        bar: bar
+                    }
 
-                    anchors.top: parent.top
-                    anchors.bottom: parent.bottom
+                    BarWrapper {
+                        id: bar
 
-                    screen: scope.modelData
-                    visibilities: visibilities
-                    popouts: panels.popouts
+                        anchors.top: parent.top
+                        anchors.bottom: parent.bottom
 
-                    Component.onCompleted: Visibilities.bars.set(scope.modelData, this)
+                        screen: scope.modelData
+                        visibilities: visibilities
+                        popouts: panels.popouts
+
+                        Component.onCompleted: Visibilities.bars.set(scope.modelData, this)
+                    }
                 }
             }
         }
diff --git a/modules/drawers/Interactions.qml b/modules/drawers/Interactions.qml
index 2783f37a..337b0ff2 100644
--- a/modules/drawers/Interactions.qml
+++ b/modules/drawers/Interactions.qml
@@ -54,6 +54,7 @@ CustomMouseArea {
     }
 
     anchors.fill: parent
+    // FIXME: remove when Hyprland bug fixed
     anchors.rightMargin: -1
     anchors.bottomMargin: -1
     hoverEnabled: true