1 files changed, 14 insertions, 1 deletions
diff --git a/modules/launcher/Wrapper.qml b/modules/launcher/Wrapper.qml
index 51354c2..3312d5a 100644
--- a/modules/launcher/Wrapper.qml
+++ b/modules/launcher/Wrapper.qml
@@ -8,12 +8,22 @@ import QtQuick
 Item {
     id: root
 
+    required property ShellScreen screen
     required property PersistentProperties visibilities
     required property var panels
 
     readonly property bool shouldBeActive: visibilities.launcher && Config.launcher.enabled
     property int contentHeight
 
+    readonly property real maxHeight: {
+        let max = screen.height - Config.border.thickness * 2 - Appearance.spacing.large;
+        if (visibilities.dashboard)
+            max -= panels.dashboard.nonAnimHeight;
+        return max;
+    }
+
+    onMaxHeightChanged: timer.start()
+
     visible: height > 0
     implicitHeight: 0
     implicitWidth: content.implicitWidth
@@ -84,7 +94,7 @@ Item {
 
         interval: Appearance.anim.durations.extraLarge
         onRunningChanged: {
-            if (running) {
+            if (running && !root.shouldBeActive) {
                 content.visible = false;
                 content.active = true;
             } else {
@@ -108,6 +118,9 @@ Item {
         sourceComponent: Content {
             visibilities: root.visibilities
             panels: root.panels
+            maxHeight: root.maxHeight
+
+            Component.onCompleted: root.contentHeight = implicitHeight
         }
     }
 }