diff --git a/src/graphics/engine/engine.cpp b/src/graphics/engine/engine.cpp
index 198e230d..c146d767 100644
--- a/src/graphics/engine/engine.cpp
+++ b/src/graphics/engine/engine.cpp
@@ -408,6 +408,7 @@ void CEngine::ReloadAllTextures()
 {
     FlushTextureCache();
     m_text->FlushCache();
+    m_text->ReloadFonts();
 
     m_app->GetEventQueue()->AddEvent(Event(EVENT_RELOAD_TEXTURES));
     UpdateGroundSpotTextures();
diff --git a/src/graphics/engine/text.cpp b/src/graphics/engine/text.cpp
index a85bd5fd..bf8ac426 100644
--- a/src/graphics/engine/text.cpp
+++ b/src/graphics/engine/text.cpp
@@ -191,17 +191,32 @@ CText::~CText()
 
 bool CText::Create()
 {
-    CFontLoader fontLoader;
-    if (!fontLoader.Init())
-    {
-        GetLogger()->Warn("Error on parsing fonts config file: failed to open file\n");
-    }
     if (TTF_Init() != 0)
     {
         m_error = std::string("TTF_Init error: ") + std::string(TTF_GetError());
         return false;
     }
 
+    if (!ReloadFonts())
+    {
+        return false;
+    }
+
+    return true;
+}
+
+bool CText::ReloadFonts()
+{
+    CFontLoader fontLoader;
+    if (!fontLoader.Init())
+    {
+        GetLogger()->Warn("Error on parsing fonts config file: failed to open file\n");
+    }
+
+    // Backup previous fonts
+    auto fonts = std::move(m_fonts);
+    m_fonts.clear();
+
     for (auto type : {FONT_COMMON, FONT_STUDIO, FONT_SATCOM})
     {
         m_fonts[static_cast<Gfx::FontType>(type)] = MakeUnique<MultisizeFont>(fontLoader.GetFont(type));
@@ -214,7 +229,10 @@ bool CText::Create()
         FontType type = (*it).first;
         CachedFont* cf = GetOrOpenFont(type, m_defaultSize);
         if (cf == nullptr || cf->font == nullptr)
+        {
+            m_fonts = std::move(fonts);
             return false;
+        }
     }
 
     return true;
@@ -259,9 +277,9 @@ void CText::FlushCache()
         }
     }
 
-    //TODO: fix this
-    Destroy();
-    Create();
+    m_lastCachedFont = nullptr;
+    m_lastFontType = FONT_COMMON;
+    m_lastFontSize = 0;
 }
 
 int CText::GetTabSize()
diff --git a/src/graphics/engine/text.h b/src/graphics/engine/text.h
index 3a5bff88..34a2d832 100644
--- a/src/graphics/engine/text.h
+++ b/src/graphics/engine/text.h
@@ -256,6 +256,8 @@ public:
 
     //! Flushes cached textures
     void        FlushCache();
+    //! Try to load new font files
+    bool        ReloadFonts();
 
     //@{
     //! Tab size management