diff --git a/app/qml/components/MMDrawer.qml b/app/qml/components/MMDrawer.qml
index 3b571d2fd..501c129a3 100644
--- a/app/qml/components/MMDrawer.qml
+++ b/app/qml/components/MMDrawer.qml
@@ -34,6 +34,12 @@ Drawer {
   edge: Qt.BottomEdge
   dragMargin: 0
 
+  // Qt 6.9+ Popup/Drawer automatically applies safe area margins as padding.
+  topPadding: 0
+  bottomPadding: 0
+  leftPadding: 0
+  rightPadding: 0
+
   // rounded background
   background: Rectangle {
     color: __style.polarColor
diff --git a/app/qml/form/components/MMFeaturesListPageDrawer.qml b/app/qml/form/components/MMFeaturesListPageDrawer.qml
index 397ed3e14..b463a687f 100644
--- a/app/qml/form/components/MMFeaturesListPageDrawer.qml
+++ b/app/qml/form/components/MMFeaturesListPageDrawer.qml
@@ -37,7 +37,12 @@ Drawer {
   height: ApplicationWindow.window.height
 
   edge: Qt.BottomEdge
-  padding: 0
+
+  // Qt 6.9+ Popup/Drawer automatically applies safe area margins as padding.
+  topPadding: 0
+  bottomPadding: 0
+  leftPadding: 0
+  rightPadding: 0
 
   contentItem: MMComponents.MMPage {
     id: page
@@ -123,7 +128,10 @@ Drawer {
         text: qsTr( "Add feature" )
         visible: __activeProject.projectRole !== "reader"
 
-        onClicked: root.buttonClicked()
+        onClicked: {
+          root.close()
+          root.buttonClicked()
+        }
       }
     }
   }