diff --git a/firmware/rolo.c b/firmware/rolo.c
index 6857290260..a8e8f3938b 100644
--- a/firmware/rolo.c
+++ b/firmware/rolo.c
@@ -229,13 +229,13 @@ int rolo_load(const char* filename)
     int err, length;
 
     lcd_clear_display();
-    lcd_puts(0, 0, "ROLO...");
-    lcd_puts(0, 1, "Loading");
+    lcd_puts(0, 0, "ROLO");
+    lcd_puts(0, 1, "Loading...");
     lcd_update();
 #ifdef HAVE_REMOTE_LCD
     lcd_remote_clear_display();
-    lcd_remote_puts(0, 0, "ROLO...");
-    lcd_remote_puts(0, 1, "Loading");
+    lcd_remote_puts(0, 0, "ROLO");
+    lcd_remote_puts(0, 1, "Loading...");
     lcd_remote_update();
 #endif
 
@@ -296,20 +296,25 @@ int rolo_load(const char* filename)
     rolo_restart_cop();
     /* Wait for COP to be in safe code */
     while(cpu_reply != 1);
-    lcd_puts(0, 2, "                          ");
+    lcd_clear_display();
+    lcd_puts(0, 0, "ROLO");
+    lcd_puts(0, 1, "Loading...");
     lcd_update();
 #endif
 
 #ifdef HAVE_STORAGE_FLUSH
-    lcd_puts(0, 1, "Flushing storage buffers");
+    lcd_puts(0, 1, "Flushing storage buffers...");
     lcd_update();
     storage_flush();
+    lcd_clear_display();
+    lcd_puts(0, 0, "ROLO");
+    lcd_update();
 #endif
 
-    lcd_puts(0, 1, "Executing");
+    lcd_puts(0, 1, "Executing...");
     lcd_update();
 #ifdef HAVE_REMOTE_LCD
-    lcd_remote_puts(0, 1, "Executing");
+    lcd_remote_puts(0, 1, "Executing...");
     lcd_remote_update();
 #endif