diff --git a/src/declarativeimports/plasmacomponents/qml/private/PageStack.js b/src/declarativeimports/plasmacomponents/qml/private/PageStack.js
index 8d281e088..8986956b0 100644
--- a/src/declarativeimports/plasmacomponents/qml/private/PageStack.js
+++ b/src/declarativeimports/plasmacomponents/qml/private/PageStack.js
@@ -215,8 +215,8 @@ function pop(page, immediate) {
 
 // Checks if the orientation changes between oldPage and newPage
 function orientationChanges(oldPage, newPage) {
-    return newPage.orientationLock != PlasmaComponents.PageOrientation.Automatic
-           && newPage.orientationLock != PlasmaComponents.PageOrientation.LockPrevious
+    return newPage.orientationLock != 0 //PlasmaComponents.PageOrientation.Automatic
+           && newPage.orientationLock != 3//PlasmaComponents.PageOrientation.LockPrevious
            && newPage.orientationLock != oldPage.orientationLock
 }
 
diff --git a/src/declarativeimports/plasmaextracomponents/qml/PageRow.qml b/src/declarativeimports/plasmaextracomponents/qml/PageRow.qml
index d7989ea49..acdadd9cb 100644
--- a/src/declarativeimports/plasmaextracomponents/qml/PageRow.qml
+++ b/src/declarativeimports/plasmaextracomponents/qml/PageRow.qml
@@ -125,7 +125,7 @@ Item {
             return
         }
 
-        scrollAnimation.to = Math.max(0, Math.min(Math.max(0, columnWidth * level - columnWidth), mainFlickable.contentWidth - mainFlickable.width))
+        scrollAnimation.to = Math.max(0, Math.min(Math.max(0, columnWidth * level - columnWidth), mainFlickable.contentWidth))
         scrollAnimation.running = true
     }