diff --git a/containments/homescreens/folio/qml/FolioHomeScreen.qml b/containments/homescreens/folio/qml/FolioHomeScreen.qml
index b4538ecf..c56a9cf6 100644
--- a/containments/homescreens/folio/qml/FolioHomeScreen.qml
+++ b/containments/homescreens/folio/qml/FolioHomeScreen.qml
@@ -351,7 +351,7 @@ Item {
                     width: ShellSettings.Settings.convergenceModeEnabled ? Kirigami.Units.gridUnit * 3 : Kirigami.Units.gridUnit * 6
 
                     anchors.topMargin: root.topMargin
-                    anchors.bottomMargin: root.bottomMargin
+                    anchors.bottomMargin: ShellSettings.Settings.convergenceModeEnabled ? 0 : root.bottomMargin
                     anchors.leftMargin: root.leftMargin
                     anchors.rightMargin: root.rightMargin
 
diff --git a/containments/taskpanel/qml/main.qml b/containments/taskpanel/qml/main.qml
index c06fd5e5..8720bd88 100644
--- a/containments/taskpanel/qml/main.qml
+++ b/containments/taskpanel/qml/main.qml
@@ -86,7 +86,10 @@ ContainmentItem {
             root.panel.offset = intendedWindowOffset;
             root.panel.thickness = navigationPanelHeight;
             root.panel.location = intendedWindowLocation;
-            root.panel.visibilityMode = ShellSettings.Settings.autoHidePanelsEnabled ? 3 : 0;
+            // In convergence mode the navigation panel is invisible (its functions
+            // live in the dock), so auto-hide the panel window to avoid reserving
+            // empty screen space at the bottom edge.
+            root.panel.visibilityMode = (ShellSettings.Settings.autoHidePanelsEnabled || ShellSettings.Settings.convergenceModeEnabled) ? 3 : 0;
             MobileShell.ShellUtil.setWindowLayer(root.panel, LayerShell.Window.LayerOverlay);
             root.updateTouchArea();
         }