diff --git a/plasmoid/package/contents/ui/taskslayout/ScrollEdgeShadows.qml b/plasmoid/package/contents/ui/taskslayout/ScrollEdgeShadows.qml
index 9b1d915a5..99b21efe6 100644
--- a/plasmoid/package/contents/ui/taskslayout/ScrollEdgeShadows.qml
+++ b/plasmoid/package/contents/ui/taskslayout/ScrollEdgeShadows.qml
@@ -58,7 +58,6 @@ Item {
     }
 
     states: [
-        ///Left Edge
         State {
             name: "bottom"
             when: plasmoid.location === PlasmaCore.Types.BottomEdge
@@ -79,6 +78,26 @@ Item {
                     horizontalCenter:parent.horizontalCenter; verticalCenter:undefined}
             }
         },
+        State {
+            name: "top"
+            when: plasmoid.location === PlasmaCore.Types.TopEdge
+
+            AnchorChanges {
+                target: firstGradient
+                anchors{ top:parent.top; bottom:undefined; left:parent.left; right:undefined;
+                    horizontalCenter:undefined; verticalCenter:undefined}
+            }
+            AnchorChanges {
+                target: lastGradient
+                anchors{ top:parent.top; bottom:undefined; left:undefined; right:parent.right;
+                    horizontalCenter:undefined; verticalCenter:undefined}
+            }
+            AnchorChanges {
+                target: shadowsContainer
+                anchors{ top:parent.top; bottom:undefined; left:undefined; right:undefined;
+                    horizontalCenter:parent.horizontalCenter; verticalCenter:undefined}
+            }
+        },
         State {
             name: "left"
             when: plasmoid.location === PlasmaCore.Types.LeftEdge
@@ -98,6 +117,26 @@ Item {
                 anchors{ top:undefined; bottom:undefined; left:parent.left; right:undefined;
                     horizontalCenter:undefined; verticalCenter:parent.verticalCenter}
             }
+        },
+        State {
+            name: "right"
+            when: plasmoid.location === PlasmaCore.Types.RightEdge
+
+            AnchorChanges {
+                target: firstGradient
+                anchors{ top:parent.top; bottom:undefined; left:undefined; right:parent.right;
+                    horizontalCenter:undefined; verticalCenter:undefined}
+            }
+            AnchorChanges {
+                target: lastGradient
+                anchors{ top:undefined; bottom:parent.bottom; left:undefined; right:parent.right;
+                    horizontalCenter:undefined; verticalCenter:undefined}
+            }
+            AnchorChanges {
+                target: shadowsContainer
+                anchors{ top:undefined; bottom:undefined; left:undefined; right:parent.right;
+                    horizontalCenter:undefined; verticalCenter:parent.verticalCenter}
+            }
         }
     ]
 }
diff --git a/plasmoid/package/contents/ui/taskslayout/ScrollOpacityMask.qml b/plasmoid/package/contents/ui/taskslayout/ScrollOpacityMask.qml
index 9f2addf07..39138b11f 100644
--- a/plasmoid/package/contents/ui/taskslayout/ScrollOpacityMask.qml
+++ b/plasmoid/package/contents/ui/taskslayout/ScrollOpacityMask.qml
@@ -68,7 +68,6 @@ Item {
     }
 
     states: [
-        ///Left Edge
         State {
             name: "bottom"
             when: plasmoid.location === PlasmaCore.Types.BottomEdge
@@ -89,6 +88,26 @@ Item {
                     horizontalCenter:undefined; verticalCenter:undefined}
             }
         },
+        State {
+            name: "top"
+            when: plasmoid.location === PlasmaCore.Types.TopEdge
+
+            AnchorChanges {
+                target: firstGradient
+                anchors{ top:parent.top; bottom:undefined; left:parent.left; right:undefined;
+                    horizontalCenter:undefined; verticalCenter:undefined}
+            }
+            AnchorChanges {
+                target: centralRectangle
+                anchors{ top:parent.top; bottom:undefined; left:undefined; right:undefined;
+                    horizontalCenter:parent.horizontalCenter; verticalCenter:undefined}
+            }
+            AnchorChanges {
+                target: lastGradient
+                anchors{ top:parent.top; bottom:undefined; left:undefined; right:parent.right;
+                    horizontalCenter:undefined; verticalCenter:undefined}
+            }
+        },
         State {
             name: "left"
             when: plasmoid.location === PlasmaCore.Types.LeftEdge
@@ -108,6 +127,26 @@ Item {
                 anchors{ top:undefined; bottom:parent.bottom; left:parent.left; right:undefined;
                     horizontalCenter:undefined; verticalCenter:undefined}
             }
+        },
+        State {
+            name: "right"
+            when: plasmoid.location === PlasmaCore.Types.RightEdge
+
+            AnchorChanges {
+                target: firstGradient
+                anchors{ top:parent.top; bottom:undefined; left:undefined; right:parent.right;
+                    horizontalCenter:undefined; verticalCenter:undefined}
+            }
+            AnchorChanges {
+                target: centralRectangle
+                anchors{ top:undefined; bottom:undefined; left:undefined; right:parent.right;
+                    horizontalCenter:undefined; verticalCenter:parent.verticalCenter}
+            }
+            AnchorChanges {
+                target: lastGradient
+                anchors{ top:undefined; bottom:parent.bottom; left:undefined; right:parent.right;
+                    horizontalCenter:undefined; verticalCenter:undefined}
+            }
         }
     ]
 }