diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index eefc96a3dc..292417b40c 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -5515,7 +5515,7 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct
                {MENU_ENUM_LABEL_UI_COMPANION_START_ON_BOOT,                            PARSE_ONLY_BOOL,   true},
                {MENU_ENUM_LABEL_UI_MENUBAR_ENABLE,                                     PARSE_ONLY_BOOL,   true},
                {MENU_ENUM_LABEL_DESKTOP_MENU_ENABLE,                                   PARSE_ONLY_BOOL,   true},
-               {MENU_ENUM_LABEL_UI_COMPANION_TOGGLE,                                   PARSE_ONLY_BOOL,   true},
+               {MENU_ENUM_LABEL_UI_COMPANION_TOGGLE,                                   PARSE_ONLY_BOOL,   false},
                {MENU_ENUM_LABEL_VIDEO_3DS_DISPLAY_MODE,                                PARSE_ONLY_UINT,   true},
                {MENU_ENUM_LABEL_VIDEO_3DS_LCD_BOTTOM,                                  PARSE_ONLY_BOOL,   true},
             };
@@ -5528,6 +5528,10 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct
                      if (settings->bools.kiosk_mode_enable)
                         build_list[i].checked = true;
                      break;
+                  case MENU_ENUM_LABEL_UI_COMPANION_TOGGLE:
+                     if (settings->bools.desktop_menu_enable)
+                        build_list[i].checked = true;
+                     break;
                   default:
                      break;
                }
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 6b479b053f..e6aef2bccd 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -14960,6 +14960,9 @@ static bool setting_append_list(
                general_write_handler,
                general_read_handler,
                SD_FLAG_NONE);
+         (*list)[list_info->index - 1].action_ok     = setting_bool_action_left_with_refresh;
+         (*list)[list_info->index - 1].action_left   = setting_bool_action_left_with_refresh;
+         (*list)[list_info->index - 1].action_right  = setting_bool_action_right_with_refresh;
 
          CONFIG_BOOL(
                list, list_info,