diff --git a/components/mobileshell/qml/navigationpanel/NavigationPanel.qml b/components/mobileshell/qml/navigationpanel/NavigationPanel.qml
index ae1fd07c..80e0b13a 100644
--- a/components/mobileshell/qml/navigationpanel/NavigationPanel.qml
+++ b/components/mobileshell/qml/navigationpanel/NavigationPanel.qml
@@ -148,7 +148,7 @@ Item {
             orientation: root.isVertical ? ListView.Vertical : ListView.Horizontal
             spacing: Kirigami.Units.smallSpacing
             clip: true
-            interactive: contentWidth > width
+            interactive: root.isVertical ? contentHeight > height : contentWidth > width
             model: root.taskModel
 
             delegate: NavigationPanelButton {
diff --git a/containments/taskpanel/qml/main.qml b/containments/taskpanel/qml/main.qml
index 9f3aa4cf..7d78f2cc 100644
--- a/containments/taskpanel/qml/main.qml
+++ b/containments/taskpanel/qml/main.qml
@@ -158,13 +158,13 @@ ContainmentItem {
         color: "transparent"
         flags: Qt.FramelessWindowHint | Qt.WindowTransparentForInput
         // height is set by layer-shell anchoring; provide a fallback.
-        height: Kirigami.Units.gridUnit * 3
+        height: root.navigationPanelHeight
         width: 1 // layer-shell stretches it via AnchorLeft|AnchorRight
 
         LayerShell.Window.scope: "dock-space"
         LayerShell.Window.layer: LayerShell.Window.LayerBottom
         LayerShell.Window.anchors: LayerShell.Window.AnchorBottom | LayerShell.Window.AnchorLeft | LayerShell.Window.AnchorRight
-        LayerShell.Window.exclusionZone: Kirigami.Units.gridUnit * 3
+        LayerShell.Window.exclusionZone: root.navigationPanelHeight
         LayerShell.Window.keyboardInteractivity: LayerShell.Window.KeyboardInteractivityNone
     }