1 files changed, 4 insertions, 2 deletions

diff --git a/firmware/drivers/lcd-bitmap-common.c b/firmware/drivers/lcd-bitmap-common.c
index 8e3b52c246..fa18f9fa1f 100644
--- a/firmware/drivers/lcd-bitmap-common.c
+++ b/firmware/drivers/lcd-bitmap-common.c
@@ -470,8 +470,10 @@ void LCDFN(scroll_fn)(void)
         }
         else {
             /* scroll forward the whole time */
-            if (s->offset >= s->width)
-                s->offset %= s->width;
+            if (s->offset >= s->width) {
+                s->offset = 0;
+                s->start_tick = current_tick + LCDFN(scroll_info).delay * 2;
+            }
         }
         LCDFN(putsxyofs_style)(xpos, ypos, s->line, s->style, s->width,
                                pf->height, s->offset);