diff --git a/src/pc/djui/djui_panel_language.c b/src/pc/djui/djui_panel_language.c
index d7d0447b3..e160b130c 100644
--- a/src/pc/djui/djui_panel_language.c
+++ b/src/pc/djui/djui_panel_language.c
@@ -48,16 +48,18 @@ static void djui_panel_language_destroy(UNUSED struct DjuiBase* caller) {
             snprintf(configLanguage, MAX_CONFIG_STRING, "%s", "");
         }
 
-        djui_panel_shutdown();
         if (gPanelLanguageOnStartup) {
+            djui_panel_shutdown();
             gDjuiInMainMenu = true;
             djui_panel_main_create(NULL);
         } else if (gDjuiInMainMenu) {
+            djui_panel_shutdown();
             gDjuiInMainMenu = true;
             djui_panel_main_create(NULL);
             djui_panel_options_create(NULL);
             djui_panel_misc_create(NULL);
         } else if (gDjuiPanelPauseCreated) {
+            djui_panel_shutdown();
             djui_panel_pause_create(NULL);
             djui_panel_options_create(NULL);
             djui_panel_misc_create(NULL);
diff --git a/src/pc/djui/djui_panel_menu_options.c b/src/pc/djui/djui_panel_menu_options.c
index a31c0f223..0076b5513 100644
--- a/src/pc/djui/djui_panel_menu_options.c
+++ b/src/pc/djui/djui_panel_menu_options.c
@@ -42,8 +42,6 @@ static void djui_panel_misc_djui_setting_change(UNUSED struct DjuiBase* caller)
         djui_panel_options_create(NULL);
         djui_panel_misc_create(NULL);
         djui_panel_main_menu_create(NULL);
-    } else {
-        djui_panel_shutdown();
     }
 }