diff --git a/src/controls/private/ActionButton.qml b/src/controls/private/ActionButton.qml
--- a/src/controls/private/ActionButton.qml
+++ b/src/controls/private/ActionButton.qml
@@ -159,16 +159,13 @@
                 //*the finger is still on the button
                 if (Math.abs((button.x + button.width/2) - startX) < Units.gridUnit &&
                     mouse.y > 0) {
-                    if (!actionUnderMouse) {
-                        return;
-                    }
 
                     //if an action has been assigned, trigger it
                     if (actionUnderMouse && actionUnderMouse.trigger) {
                         actionUnderMouse.trigger();
                     }
 
-                    if (actionUnderMouse.hasOwnProperty("children") && actionUnderMouse.children.length > 0) {
+                    if (actionUnderMouse && actionUnderMouse.hasOwnProperty("children") && actionUnderMouse.children.length > 0) {
                         var subMenuUnderMouse;
                         switch (actionUnderMouse) {
                         case leftAction:
diff --git a/src/controls/templates/SwipeListItem.qml b/src/controls/templates/SwipeListItem.qml
--- a/src/controls/templates/SwipeListItem.qml
+++ b/src/controls/templates/SwipeListItem.qml
@@ -339,7 +339,7 @@
                     }
                 }
                 onClicked: {
-                    if (Math.abs(listItem.background.x) < Units.gridUnit && internal.edgeEnabled) {
+                    if (Math.abs(listItem.background.x) < Kirigami.Units.gridUnit && internal.edgeEnabled) {
                         dragButton.clicked(mouse);
                     }
                 }