diff --git a/containment/package/contents/ui/abilities/privates/LayouterPrivate.qml b/containment/package/contents/ui/abilities/privates/LayouterPrivate.qml
index 472c88944..7931d387e 100644
--- a/containment/package/contents/ui/abilities/privates/LayouterPrivate.qml
+++ b/containment/package/contents/ui/abilities/privates/LayouterPrivate.qml
@@ -391,7 +391,7 @@ Item {
         if (remainedSpace) {
             if (startLayout.fillApplets > 0) {
                 startNo = 0;
-            } else if (lendLayout.fillApplets > 0) {
+            } else if (endLayout.fillApplets > 0) {
                 endNo = 0;
             } else if (mainLayout.fillApplets > 0) {
                 mainNo = 0;
diff --git a/plasmoid/package/contents/ui/taskslayout/ScrollableList.qml b/plasmoid/package/contents/ui/taskslayout/ScrollableList.qml
index 1b8d9745d..b311cbb84 100644
--- a/plasmoid/package/contents/ui/taskslayout/ScrollableList.qml
+++ b/plasmoid/package/contents/ui/taskslayout/ScrollableList.qml
@@ -169,7 +169,7 @@ Flickable{
         var block = !root.autoScrollTasksEnabled && !duringDragging;
 
         if (block || !contentsExceed || root.tasksCount < 3
-                || (task.itemIndex===task.indexer.lastVisibleItemIndex && parabolic.factor.zoom>1)) {
+                || (task.itemIndex===task.abilities.indexer.lastVisibleItemIndex && appletAbilities.parabolic.factor.zoom>1)) {
             //last task with parabolic effect breaks the autoscolling behavior
             return;
         }