diff --git a/components/mobileshell/qml/actiondrawer/ActionDrawer.qml b/components/mobileshell/qml/actiondrawer/ActionDrawer.qml
index d099deeb..635d4eb2 100644
--- a/components/mobileshell/qml/actiondrawer/ActionDrawer.qml
+++ b/components/mobileshell/qml/actiondrawer/ActionDrawer.qml
@@ -132,10 +132,6 @@ Item {
      */
     signal runPendingNotificationAction()
 
-    onOpenedChanged: {
-        if (opened) swipeArea.focus = true;
-    }
-
     property real oldOffset
     onOffsetChanged: {
         if (offset < 0) {
@@ -149,7 +145,7 @@ Item {
         oldOffset = offset;
 
         // close panel immediately after panel is not shown, and the flickable is not being dragged
-        if (opened && root.offset <= 0 && !swipeArea.moving && !drawerAnimation.running) {
+        if (opened && root.offset <= 0 && !contentContainer.swipeAreaMoving && !drawerAnimation.running) {
             root.state = "";
             offset = 0;
             focus = false;
diff --git a/components/mobileshell/qml/actiondrawer/ContentContainer.qml b/components/mobileshell/qml/actiondrawer/ContentContainer.qml
index fabb6d9e..e5c1af74 100644
--- a/components/mobileshell/qml/actiondrawer/ContentContainer.qml
+++ b/components/mobileshell/qml/actiondrawer/ContentContainer.qml
@@ -24,6 +24,8 @@ Item {
     readonly property real minimizedQuickSettingsOffset: contentContainerLoader.minimizedQuickSettingsOffset
     readonly property real maximizedQuickSettingsOffset: contentContainerLoader.maximizedQuickSettingsOffset
 
+    readonly property bool swipeAreaMoving: swipeAreaBase.moving || swipeAreaPortrait.moving
+
     Kirigami.Theme.colorSet: Kirigami.Theme.View
     Kirigami.Theme.inherit: false