diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index 83f4c3f1cc..969fb99123 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -317,6 +317,7 @@ static void init_video_input(const input_driver_t *tmp)
 void uninit_video_input(void)
 {
    rarch_main_command(RARCH_CMD_OVERLAY_DEINIT);
+   rarch_main_command(RARCH_CMD_OSK_OVERLAY_DEINIT);
 
    if (
          !driver.input_data_own &&
diff --git a/input/input_overlay.c b/input/input_overlay.c
index b13845ed3a..ad0ecdc407 100644
--- a/input/input_overlay.c
+++ b/input/input_overlay.c
@@ -595,8 +595,6 @@ input_overlay_t *input_overlay_new(const char *path, bool enable,
 {
    input_overlay_t *ol = (input_overlay_t*)calloc(1, sizeof(*ol));
 
-   RARCH_LOG("path is: %s\n", path);
-
    if (!ol)
       goto error;
 
diff --git a/retroarch.c b/retroarch.c
index f8bcfc9147..0f7437cadd 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2695,10 +2695,15 @@ bool rarch_main_command(unsigned cmd)
          break;
       case RARCH_CMD_OSK_OVERLAY_START:
 #ifdef HAVE_OVERLAY
+         if (!g_settings.osk.enable)
+            return false;
+
          driver.osk_active = true;
          g_settings.osk.opacity = 100;
          input_overlay_set_alpha_mod(driver.osk_overlay,
                g_settings.osk.opacity);
+         input_overlay_enable(driver.osk_overlay,
+               true);
 #endif
          break;
       case RARCH_CMD_OSK_OVERLAY_DEINIT:
@@ -2712,8 +2717,6 @@ bool rarch_main_command(unsigned cmd)
          break;
       case RARCH_CMD_OSK_OVERLAY_INIT:
 #ifdef HAVE_OVERLAY
-         if (driver.osk_active)
-            return false;
          rarch_main_command(RARCH_CMD_OSK_OVERLAY_DEINIT);
 
          driver.osk_overlay = input_overlay_new(g_settings.osk.overlay, g_settings.osk.enable,
diff --git a/settings.c b/settings.c
index f8e318d244..b37de1eb68 100644
--- a/settings.c
+++ b/settings.c
@@ -1358,8 +1358,6 @@ static bool config_load_file(const char *path, bool set_defaults)
 
    CONFIG_GET_PATH(osk.overlay, "input_osk_overlay");
    CONFIG_GET_BOOL(osk.enable, "input_osk_overlay_enable");
-   CONFIG_GET_FLOAT(osk.opacity, "input_osk_overlay_opacity");
-   CONFIG_GET_FLOAT(osk.scale, "input_osk_overlay_scale");
 #endif
 
    CONFIG_GET_BOOL(rewind_enable, "rewind_enable");
@@ -1988,10 +1986,6 @@ bool config_save_file(const char *path)
          *g_extern.osk_overlay_dir ? g_extern.osk_overlay_dir : "default");
    config_set_path(conf, "input_osk_overlay", g_settings.input.overlay);
    config_set_bool(conf, "input_osk_overlay_enable", g_settings.osk.enable);
-   config_set_float(conf, "input_osk_overlay_opacity",
-         g_settings.osk.opacity);
-   config_set_float(conf, "input_osk_overlay_scale",
-         g_settings.osk.scale);
 #endif
 
    config_set_path(conf, "video_font_path", g_settings.video.font_path);