diff --git a/radio/src/gui/colorlcd/file_carosell.cpp b/radio/src/gui/colorlcd/file_carosell.cpp
index 6a9bf07da..cdabc5993 100644
--- a/radio/src/gui/colorlcd/file_carosell.cpp
+++ b/radio/src/gui/colorlcd/file_carosell.cpp
@@ -25,7 +25,6 @@ extern inline tmr10ms_t getTicks()
   return g_tmr10ms;
 }
 
-#define PAGE_INTERVAL ((1000 / 10) * 2)
 
 
 FileCarosell::FileCarosell(Window *parent, const rect_t &rect,
@@ -42,23 +41,43 @@ FileCarosell::~FileCarosell()
 {
 }
 
-  void FileCarosell::setFileNames(std::vector<std::string> fileNames)
-  {
-    _fileNames = fileNames;
-    selected = -1;  // so it passes the sameness comparison
-    setSelected(0);
-    timer = getTicks();
-  }
+void FileCarosell::setFileNames(std::vector<std::string> fileNames)
+{
+  _fileNames = fileNames;
+  setSelected(-1);
+  timer = getTicks();
+  pageInterval = SHORT_PAGE_INTERVAL;
+}
 
+void FileCarosell::setSelected(int n)
+{
+  if (n == selected) return;
+  
+  selected = n;
+
+  if (n >= 0 && n < (int)_fileNames.size()) {
+    fp->setFile(_fileNames[selected].c_str());
+  } else
+    fp->setFile("");
+}
+
+void FileCarosell::paint(BitmapBuffer *dc)
+{
+  if (selected == -1 || _fileNames.size() == 0) {
+    const char *message = selected == -1 && _fileNames.size() > 0 ? "Loading..." : "No theme image";
+    dc->drawText(width() / 2, height() / 2, message, FONT(L) + CENTERED);
+  }
+}
 
 void FileCarosell::checkEvents()
 {
   FormGroup::checkEvents();
 
   uint32_t newTicks = getTicks();
-  if (newTicks - timer > PAGE_INTERVAL && _fileNames.size()) {
+  if (newTicks - timer > pageInterval && _fileNames.size()) {
     int newSelected = (selected + 1) % _fileNames.size();
     setSelected(newSelected);
     timer = newTicks;
+    pageInterval = PAGE_INTERVAL;
   }
 }
diff --git a/radio/src/gui/colorlcd/file_carosell.h b/radio/src/gui/colorlcd/file_carosell.h
index e09dc62f7..a268f05a4 100644
--- a/radio/src/gui/colorlcd/file_carosell.h
+++ b/radio/src/gui/colorlcd/file_carosell.h
@@ -24,6 +24,9 @@
 #include "file_carosell.h"
 #include "tabsgroup.h"
 
+#define PAGE_INTERVAL ((1000 / 10) * 2)
+#define SHORT_PAGE_INTERVAL ((1000 / 20))  // 500 MS
+
 class FileCarosell : public FormGroup
 {
  public:
@@ -31,22 +34,16 @@ class FileCarosell : public FormGroup
                std::vector<std::string> fileNames, FormField *nextCtrl = nullptr);
   ~FileCarosell();
 
-  inline void setSelected(int n)
-  {
-    if (n == selected) return;
-    if (n >= 0 && n < (int)_fileNames.size()) {
-      selected = n;
-      fp->setFile(_fileNames[selected].c_str());
-    } else
-      fp->setFile("");
-  }
-
+  inline void setSelected(int n);
   void setFileNames(std::vector<std::string> fileNames);
   void checkEvents() override;
 
+  void paint(BitmapBuffer *dc) override;
+
  protected:
   int selected = -1;
   std::vector<std::string> _fileNames;
   FilePreview *fp;
   uint32_t timer;
+  uint32_t pageInterval = PAGE_INTERVAL;
 };