4 files changed, 23 insertions, 4 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 53f44868..c3728b75 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -377,7 +377,7 @@ void deinit_DocumentWidget(iDocumentWidget *d) {
     removeTicker_App(prerender_DocumentWidget_, d);
     remove_Periodic(periodic_App(), d);
     delete_Translation(d->translation);
-    delete_DrawBufs(d->drawBufs);    
+    delete_DrawBufs(d->drawBufs);
     delete_VisBuf(d->visBuf);
     free(d->visBufMeta);
     delete_PtrSet(d->invalidRuns);
@@ -1273,10 +1273,14 @@ static void smoothScroll_DocumentWidget_(iDocumentWidget *d, int offset, int dur
     int destY = targetValue_Anim(&d->scrollY) + offset;
     if (destY < 0) {
         destY = 0;
+        stopWidgetMomentum_Touch(as_Widget(d));
     }
     const int scrollMax = scrollMax_DocumentWidget_(d);
     if (scrollMax > 0) {
-        destY = iMin(destY, scrollMax);
+        if (destY >= scrollMax) {
+            stopWidgetMomentum_Touch(as_Widget(d));
+            destY = scrollMax;
+        }
     }
     else {
         destY = 0;
diff --git a/src/ui/listwidget.c b/src/ui/listwidget.c
index f571bea5..8690f8e5 100644
--- a/src/ui/listwidget.c
+++ b/src/ui/listwidget.c
@@ -172,9 +172,13 @@ iBool scrollOffset_ListWidget(iListWidget *d, int offset) {
     d->scrollY += offset;
     if (d->scrollY < 0) {
         d->scrollY = 0;
+        stopWidgetMomentum_Touch(as_Widget(d));
     }
     const int scrollMax = scrollMax_ListWidget_(d);
-    d->scrollY = iMin(d->scrollY, scrollMax);
+    if (d->scrollY >= scrollMax) {
+        d->scrollY = scrollMax;
+        stopWidgetMomentum_Touch(as_Widget(d));
+    }
     d->noHoverWhileScrolling = iTrue;
     if (oldScroll != d->scrollY) {
         if (d->hoverItem != iInvalidPos) {
@@ -310,7 +314,7 @@ static iBool processEvent_ListWidget_(iListWidget *d, const SDL_Event *ev) {
             return iTrue;
         }
     }
-    else if (ev->type == SDL_USEREVENT && ev->user.code == widgetTapBegins_UserEventCode) {    
+    else if (ev->type == SDL_USEREVENT && ev->user.code == widgetTapBegins_UserEventCode) {
         d->noHoverWhileScrolling = iFalse;
     }
     if (ev->type == SDL_MOUSEMOTION) {
diff --git a/src/ui/touch.c b/src/ui/touch.c
index 8a532821..834fe4f8 100644
--- a/src/ui/touch.c
+++ b/src/ui/touch.c
@@ -696,6 +696,16 @@ iBool processEvent_Touch(const SDL_Event *ev) {
     return iTrue;
 }
 
+void stopWidgetMomentum_Touch(iWidget *widget) {
+    iTouchState *d = touchState_();
+    iForEach(Array, i, d->moms) {
+        iMomentum *mom = i.value;
+        if (mom->affinity == widget) {
+            remove_ArrayIterator(&i);
+        }
+    }
+}
+
 void widgetDestroyed_Touch(iWidget *widget) {
     iTouchState *d = touchState_();
     iForEach(Array, i, d->touches) {
diff --git a/src/ui/touch.h b/src/ui/touch.h
index 3e9c3859..0a24248b 100644
--- a/src/ui/touch.h
+++ b/src/ui/touch.h
@@ -29,6 +29,7 @@ iDeclareType(Widget)
 
 iBool   processEvent_Touch      (const SDL_Event *);
 void    update_Touch            (void);
+void    stopWidgetMomentum_Touch(iWidget *widget);
 void    widgetDestroyed_Touch   (iWidget *widget);
 
 iInt2   latestPosition_Touch    (void); /* valid during processing of current event */