diff --git a/radio/src/gui/horus/screens_setup.cpp b/radio/src/gui/horus/screens_setup.cpp
index b60991ae1..aea0d8c40 100644
--- a/radio/src/gui/horus/screens_setup.cpp
+++ b/radio/src/gui/horus/screens_setup.cpp
@@ -438,6 +438,7 @@ bool menuScreensTheme(evt_t event)
           new_theme->init();
           loadTheme(new_theme);
           strncpy(g_eeGeneral.themeName, new_theme->getName(), sizeof(g_eeGeneral.themeName));
+          killEvents(KEY_ENTER);
           storageDirty(EE_GENERAL);
         }
         break;