diff --git a/configuration.c b/configuration.c
index a11677fead..709c6e9efa 100644
--- a/configuration.c
+++ b/configuration.c
@@ -640,6 +640,8 @@ static void config_set_defaults(void)
    settings->input.autodetect_enable               = input_autodetect_enable;
    *settings->input.keyboard_layout                = '\0';
 
+   settings->osk.enable                            = true;
+
    for (i = 0; i < MAX_USERS; i++)
    {
       settings->input.joypad_map[i] = i;
@@ -788,10 +790,10 @@ static void config_set_defaults(void)
       fill_pathname_expand_special(global->dir.osk_overlay,
             g_defaults.dir.osk_overlay, sizeof(global->dir.osk_overlay));
 #ifdef RARCH_MOBILE
-      if (!*settings->input.overlay)
+      if (!*settings->input.osk_overlay)
             fill_pathname_join(settings->osk.overlay,
                   global->dir.osk_overlay,
-                  "overlays/keyboards/US-101/US-101.cfg",
+                  "overlays/keyboards/modular-keyboard/opaque/big.cfg",
                   sizeof(settings->osk.overlay));
 #endif
    }
diff --git a/frontend/drivers/platform_android.c b/frontend/drivers/platform_android.c
index 90e893190b..6b6fab2869 100644
--- a/frontend/drivers/platform_android.c
+++ b/frontend/drivers/platform_android.c
@@ -756,6 +756,8 @@ static void frontend_android_get_environment_settings(int *argc,
                   "shaders", sizeof(g_defaults.dir.shader));
             fill_pathname_join(g_defaults.dir.overlay, app_dir,
                   "overlays", sizeof(g_defaults.dir.overlay));
+            fill_pathname_join(g_defaults.dir.osk_overlay, app_dir,
+                  "overlays", sizeof(g_defaults.dir.osk_overlay));
             fill_pathname_join(g_defaults.dir.core, app_dir,
                   "cores", sizeof(g_defaults.dir.core));
             fill_pathname_join(g_defaults.dir.core_info,