diff --git a/config.def.h b/config.def.h
index 71be4036a0..5fe8720cbf 100644
--- a/config.def.h
+++ b/config.def.h
@@ -546,7 +546,11 @@ static const unsigned xmb_alpha_factor      = 75;
 static const unsigned menu_font_color_red   = 255;
 static const unsigned menu_font_color_green = 255;
 static const unsigned menu_font_color_blue  = 255;
+#ifdef HAVE_ODROIDGO2
+static const unsigned xmb_menu_layout       = 2;
+#else
 static const unsigned xmb_menu_layout       = 0;
+#endif
 static const unsigned xmb_icon_theme        = XMB_ICON_THEME_MONOCHROME;
 static const unsigned xmb_theme             = XMB_THEME_ELECTRIC_BLUE;
 
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 747aeaa9f8..6a60676d7a 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -13440,7 +13440,7 @@ static bool setting_append_list(
                   SD_FLAG_NONE);
 #endif
 
-#ifdef HAVE_LAKKA
+#if defined(HAVE_LAKKA) || defined(HAVE_ODROIDGO2)
             CONFIG_BOOL(
                   list, list_info,
                   &settings->bools.menu_show_reboot,