diff --git a/components/mobileshell/qml/actiondrawer/ActionDrawerOpenSurface.qml b/components/mobileshell/qml/actiondrawer/ActionDrawerOpenSurface.qml
index 479c3d61..84487070 100644
--- a/components/mobileshell/qml/actiondrawer/ActionDrawerOpenSurface.qml
+++ b/components/mobileshell/qml/actiondrawer/ActionDrawerOpenSurface.qml
@@ -17,6 +17,10 @@ MouseArea {
     property int oldMouseY: 0
 
     function startSwipe() {
+        if (actionDrawer.visible) {
+            // ensure the action drawer state is consistent
+            actionDrawer.closeImmediately();
+        }
         actionDrawer.cancelAnimations();
         actionDrawer.dragging = true;
         actionDrawer.opened = false;