diff --git a/firmware/drivers/lcd.c b/firmware/drivers/lcd.c
index 4d805b2506..1984f66617 100644
--- a/firmware/drivers/lcd.c
+++ b/firmware/drivers/lcd.c
@@ -1284,10 +1284,14 @@ void lcd_puts_scroll(int x, int y, unsigned char* string )
     s->textlen = strlen(string);
 
 
-#if defined(LCD_PROPFONTS) || defined(LOADABLE_FONTS)
+#if defined(LCD_PROPFONTS)
     s->space += 2;
     lcd_getstringsize(string,0,&w,&h);
     if ( w > LCD_WIDTH - xmargin ) {
+#elif defined(LOADABLE_FONTS)
+    s->space += 2;
+    lcd_getstringsize(string,_font,&w,&h);
+    if ( w > LCD_WIDTH - xmargin ) {
 #else
     if ( s->textlen > s->space ) {
 #endif