diff --git a/gfx/gfx_widgets.c b/gfx/gfx_widgets.c
index fde0e406c1..749169bcde 100644
--- a/gfx/gfx_widgets.c
+++ b/gfx/gfx_widgets.c
@@ -1914,8 +1914,6 @@ bool gfx_widgets_init(bool video_is_threaded)
    return true;
 
 error:
-   if (gfx_widgets_ready())
-      gfx_widgets_free();
    return false;
 }
 
diff --git a/retroarch.c b/retroarch.c
index 9055e9cf11..cfe6ea4178 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -23493,6 +23493,8 @@ static void drivers_init(int flags)
                video_driver_width, video_driver_height,
                settings->paths.directory_assets,
                settings->paths.path_font);
+      else
+         gfx_widgets_free();
    }
    else
    {