4 files changed, 17 insertions, 3 deletions

diff --git a/src/app.c b/src/app.c
index 52072d39..5a76ba45 100644
--- a/src/app.c
+++ b/src/app.c
@@ -1484,7 +1484,9 @@ static void runTickers_App_(iApp *d) {
     }
     iForIndices(i, d->window->base.roots) {
         iRoot *root = d->window->base.roots[i];
-        notifyVisualOffsetChange_Root(root);
+        if (root) {
+            notifyVisualOffsetChange_Root(root);
+        }
     }
 }
 
@@ -1558,6 +1560,14 @@ void refresh_App(void) {
         iConstForEach(PtrArray, j, &windows) {
             iWindow *win = j.ptr;
             setCurrent_Window(win);
+            iForIndices(i, win->roots) {
+                iRoot *root = win->roots[i];
+                if (root && root->didOverflowScroll) {
+                    /* Some widgets may need a just-in-time visual update. */
+                    notifyVisualOffsetChange_Root(root);
+                    root->didOverflowScroll = iFalse;
+                }
+            }
             switch (win->type) {
                 case main_WindowType:
     //                iTime draw;
diff --git a/src/ui/root.c b/src/ui/root.c
index e2706898..28aa4b92 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -661,7 +661,7 @@ void updateToolbarColors_Root(iRoot *d) {
 }
 
 void notifyVisualOffsetChange_Root(iRoot *d) {
-    if (d && d->didAnimateVisualOffsets) {
+    if (d && (d->didAnimateVisualOffsets || d->didOverflowScroll)) {
         iNotifyAudience(d, visualOffsetsChanged, RootVisualOffsetsChanged);
     }
 }
diff --git a/src/ui/root.h b/src/ui/root.h
index 2419b599..2f0d72c9 100644
--- a/src/ui/root.h
+++ b/src/ui/root.h
@@ -19,6 +19,7 @@ struct Impl_Root {
     iBool      pendingArrange;
     int        loadAnimTimer;
     iBool      didAnimateVisualOffsets;
+    iBool      didOverflowScroll;
     iAudience *visualOffsetsChanged; /* called after running tickers */
     iColor     tmPalette[tmMax_ColorId]; /* theme-specific palette */
 };
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 225c0480..bb3a39f1 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -1203,6 +1203,9 @@ iBool scrollOverflow_Widget(iWidget *d, int delta) {
             bounds.pos.y = iMin(bounds.pos.y, validPosRange.end);
         }
 //    printf("range: %d ... %d\n", range.start, range.end);
+        if (delta) {
+            d->root->didOverflowScroll = iTrue; /* ensure that widgets update if needed */
+        }
     }
     else {
         bounds.pos.y = iClamp(bounds.pos.y, validPosRange.start, validPosRange.end);
@@ -1871,7 +1874,7 @@ iAny *findParentClass_Widget(const iWidget *d, const iAnyClass *class) {
 }
 
 iAny *findOverflowScrollable_Widget(iWidget *d) {
-    const iRect rootRect = rect_Root(d->root);
+    const iRect rootRect = visibleRect_Root(d->root);
     for (iWidget *w = d; w; w = parent_Widget(w)) {
         if (flags_Widget(w) & overflowScrollable_WidgetFlag) {
             const iRect bounds = boundsWithoutVisualOffset_Widget(w);