diff --git a/radio/src/storage/modelslist.cpp b/radio/src/storage/modelslist.cpp
index f46119559..3694b2ec8 100644
--- a/radio/src/storage/modelslist.cpp
+++ b/radio/src/storage/modelslist.cpp
@@ -1144,6 +1144,8 @@ bool ModelsList::loadYaml()
       modelslist.push_back(model);
       filehash.celladded = true;
       model->_isDirty = true;
+      if(filehash.curmodel == true)
+        modelslist.setCurrentModel(model);
     }
   }
 
diff --git a/radio/src/storage/modelslist.h b/radio/src/storage/modelslist.h
index 14ddb30c7..89909f57e 100644
--- a/radio/src/storage/modelslist.h
+++ b/radio/src/storage/modelslist.h
@@ -77,7 +77,7 @@ class ModelCell
   char modelName[LEN_MODEL_NAME + 1] = "";
   char modelFinfoHash[FILE_HASH_LENGTH + 1] = "";
 #if LEN_BITMAP_NAME > 0
-  char modelBitmap[LEN_BITMAP_NAME] = "";
+  char modelBitmap[LEN_BITMAP_NAME + 1] = "";
 #endif
   gtime_t lastOpened = 0;
   bool _isDirty = true;