2 files changed, 2 insertions, 2 deletions

diff --git a/firmware/drivers/lcd-bitmap-common.c b/firmware/drivers/lcd-bitmap-common.c
index fb49deb76b..878c08863b 100644
--- a/firmware/drivers/lcd-bitmap-common.c
+++ b/firmware/drivers/lcd-bitmap-common.c
@@ -453,7 +453,7 @@ void LCDFN(scroll_fn)(void)
             continue;
 
         LCDFN(set_viewport)(s->vp);
-        height = s->vp->line_height;
+        height = s->vp->line_height ?: (int)font_get(s->vp->font)->height;
 
         if (s->backward)
             s->offset -= LCDFN(scroll_info).step;
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index e68795391f..f4336233ab 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -43,7 +43,7 @@ struct viewport {
 #ifdef HAVE_LCD_BITMAP
     int flags;
     int font;
-    int line_height;
+    int line_height; /* 0 for using font height */
     int drawmode;
 #endif
 #if LCD_DEPTH > 1