diff --git a/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs b/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
index 454f7eac9d..bc86558ab3 100644
--- a/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
@@ -427,6 +427,7 @@ namespace Avalonia.Controls.Presenters
 
             Viewport = finalSize;
             Extent = Child!.Bounds.Size.Inflate(Child.Margin);
+            Offset = ScrollViewer.CoerceOffset(Extent, finalSize, Offset);
             _isAnchorElementDirty = true;
 
             return finalSize;