diff --git a/src/activities/settings/FontSelectionActivity.cpp b/src/activities/settings/FontSelectionActivity.cpp
index f7ab6879..9915a14c 100644
--- a/src/activities/settings/FontSelectionActivity.cpp
+++ b/src/activities/settings/FontSelectionActivity.cpp
@@ -76,9 +76,6 @@ void FontSelectionActivity::saveAndExit() {
     SETTINGS.customFontFamily[sizeof(SETTINGS.customFontFamily) - 1] = '\0';
     SETTINGS.fontFamily = CrossPointSettings::FONT_CUSTOM;
     SETTINGS.saveToFile();
-
-    // Reload fonts to make sure the newly selected font is loaded
-    EpdFontLoader::loadFontsFromSd(renderer);
   }
   onClose();
 }
@@ -119,5 +116,9 @@ void FontSelectionActivity::render() const {
     y += 30;
   }
 
+  // Draw help text
+  const auto labels = mappedInput.mapLabels("« Back", "Select", "", "");
+  renderer.drawButtonHints(UI_10_FONT_ID, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
+
   renderer.displayBuffer();
 }
diff --git a/src/activities/settings/SettingsActivity.cpp b/src/activities/settings/SettingsActivity.cpp
index 928c6ec4..437ddd26 100644
--- a/src/activities/settings/SettingsActivity.cpp
+++ b/src/activities/settings/SettingsActivity.cpp
@@ -105,6 +105,8 @@ void SettingsActivity::loop() {
 
   if (mappedInput.wasPressed(MappedInputManager::Button::Back)) {
     SETTINGS.saveToFile();
+    // Reload fonts to make sure the newly selected font settings are loaded
+    EpdFontLoader::loadFontsFromSd(renderer);
     onGoHome();
     return;
   }