diff --git a/apps/menu.c b/apps/menu.c
index c48b444156..f690a1a381 100644
--- a/apps/menu.c
+++ b/apps/menu.c
@@ -81,9 +81,9 @@ struct menu {
 #endif /* HAVE_LCD_BITMAP */
 
 #ifdef HAVE_NEW_CHARCELL_LCD
-#define CURSOR_CHAR "\x7e"
+#define CURSOR_CHAR 0x7e
 #else
-#define CURSOR_CHAR "\x89"
+#define CURSOR_CHAR 0x89
 #endif
 
 static struct menu menus[MAX_MENUS];
@@ -112,7 +112,7 @@ void put_cursorxy(int x, int y, bool on)
         unsigned char cursor[] = { 0x7f, 0x3e, 0x1c, 0x08 };
         lcd_bitmap ( cursor, x*6, 12+y*16, 4, 8, true);
 #else
-        lcd_puts(x, y, CURSOR_CHAR);
+        lcd_putc(x, y, CURSOR_CHAR);
 #endif
     }
     else {
@@ -123,7 +123,7 @@ void put_cursorxy(int x, int y, bool on)
         /* player simulator in action */
         lcd_clearrect (x*6, 12+y*16, 4, 8);
 #else
-        lcd_puts(x, y, " ");
+        lcd_putc(x, y, ' ');
 #endif
     }
 }
diff --git a/firmware/drivers/lcd.c b/firmware/drivers/lcd.c
index 252217f4a6..e3248878da 100644
--- a/firmware/drivers/lcd.c
+++ b/firmware/drivers/lcd.c
@@ -415,9 +415,12 @@ void lcd_clear_display(void)
 
 void lcd_puts(int x, int y, unsigned char *string)
 {
+    int i;
     lcd_write(true,LCD_CURSOR(x,y));
-    while (*string && x++<11)
+    for (i=0; *string && x++<11; i++)
         lcd_write(false,lcd_ascii[*(unsigned char*)string++]);
+    for (; x<11; x++)
+        lcd_write(false,lcd_ascii[' ']);
 }
 
 void lcd_putc(int x, int y, unsigned char ch)
@@ -861,6 +864,7 @@ void lcd_putspropxy(int x, int y, unsigned char *str, int thisfont)
  */
 void lcd_puts(int x, int y, unsigned char *str)
 {
+    int xpos,ypos,w,h;
 #if defined(SIMULATOR) && defined(HAVE_LCD_CHARCELLS)
     /* We make the simulator truncate the string if it reaches the right edge,
        as otherwise it'll wrap. The real target doesn't wrap. */
@@ -879,20 +883,23 @@ void lcd_puts(int x, int y, unsigned char *str)
         return;
 
 #ifdef LCD_PROPFONTS
-    lcd_putspropxy( xmargin + x*fonts[font],
-                    ymargin + y*fontheight[font],
-                    str, font );
+    lcd_getstringsize(str, font, &w, &h);
+    xpos = xmargin + x * fonts[font];
+    ypos = ymargin + y * fontheight[font];
+    lcd_putspropxy(xpos, ypos, str, font);
 #elif LOADABLE_FONTS
-    {
-        int w,h;
-        lcd_getstringsize(str,_font,&w,&h);
-        lcd_putsldfxy( xmargin + x*w/strlen(str), ymargin + y*h, str );
-    }
+    lcd_getstringsize(str,_font,&w,&h);
+    xpos = xmargin + x * w / strlen(str);
+    ypos = ymargin + y * h;
+    lcd_putsldfxy(xpos, ypos, str);
 #else
-    lcd_putsxy( xmargin + x*fonts[font],
-                ymargin + y*fontheight[font],
-                str, font );
+    xpos = xmargin + x * fonts[font];
+    ypos = ymargin + y * fontheight[font];
+    lcd_putsxy(xpos, ypos, str, font);
+    w = strlen(str) * fonts[font];
+    h = fontheight[font];
 #endif
+    lcd_clearrect(xpos + w, ypos, LCD_WIDTH - (xpos + w), h);
 #if defined(SIMULATOR) && defined(HAVE_LCD_CHARCELLS)
     /* this function is being used when simulating a charcell LCD and
        then we update immediately */