diff --git a/sample/CustomScrollableWidget.cs b/sample/CustomScrollableWidget.cs
index 2535c9286..a06e03c18 100644
--- a/sample/CustomScrollableWidget.cs
+++ b/sample/CustomScrollableWidget.cs
@@ -184,6 +184,9 @@ class CustomScrollableWidget<T> : CustomBase, IScrollableImplementor {
 			if (hadjustment.Value + hadjustment.PageSize > hadjustment.Upper) {
 				hadjustment.Value = hadjustment.Upper - hadjustment.PageSize;
 			}
+			if (hadjustment.Upper > 0 && hadjustment.Upper < hadjustment.PageSize) {
+				hadjustment.Upper = hadjustment.PageSize;
+			}
 			hadjustment.Change ();
 		}
 		
@@ -193,6 +196,9 @@ class CustomScrollableWidget<T> : CustomBase, IScrollableImplementor {
 			if (vadjustment.Value + vadjustment.PageSize > vadjustment.Upper) {
 				vadjustment.Value = vadjustment.Upper - vadjustment.PageSize;
 			}
+			if (vadjustment.Upper > 0 && vadjustment.Upper < vadjustment.PageSize) {
+				vadjustment.Upper = vadjustment.PageSize;
+			}
 			vadjustment.Change ();
 		}
 	}