diff --git a/containments/panel/package/contents/ui/SlidingPanel.qml b/containments/panel/package/contents/ui/SlidingPanel.qml
index bca2d828..4ceac950 100644
--- a/containments/panel/package/contents/ui/SlidingPanel.qml
+++ b/containments/panel/package/contents/ui/SlidingPanel.qml
@@ -164,6 +164,7 @@ NanoShell.FullScreenOverlay {
             onContentYChanged: {
                 window.offset = -contentY + contentArea.height
             }
+            boundsBehavior: Flickable.StopAtBounds
             contentWidth: window.width
             contentHeight: window.height*2
             bottomMargin: window.height
diff --git a/containments/panel/package/contents/ui/main.qml b/containments/panel/package/contents/ui/main.qml
index 173f8339..8d3b0fb2 100644
--- a/containments/panel/package/contents/ui/main.qml
+++ b/containments/panel/package/contents/ui/main.qml
@@ -252,7 +252,7 @@ PlasmaCore.ColorScope {
             slidingPanel.showFullScreen();
         }
         onPositionChanged: {
-            slidingPanel.offset = slidingPanel.offset + (mouse.y - oldMouseY);
+            slidingPanel.offset = Math.min(slidingPanel.contentItem.height, slidingPanel.offset + (mouse.y - oldMouseY));
             oldMouseY = mouse.y;
         }
         onReleased: {