diff --git a/bootcore.cpp b/bootcore.cpp
index 5a02541..a1a93fc 100644
--- a/bootcore.cpp
+++ b/bootcore.cpp
@@ -161,13 +161,7 @@ char *findCore(const char *name, char *coreName, int indent)
 }
 
 void bootcore_init(const char *path)
-{
-	MiSTer_ini_parse();
-	if (cfg.bootcore[0] == '\0')
-	{
-		return;
-	}
-
+{	
 	char *auxpointer;
 	char auxstr[256];
 	char bootcore[256];
diff --git a/main.cpp b/main.cpp
index a9fd5a9..fdcb48f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -31,7 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "input.h"
 #include "fpga_io.h"
 #include "scheduler.h"
-#include "bootcore.h"
 
 const char *version = "$VER:HPS" VDATE;
 
@@ -65,8 +64,7 @@ int main(int argc, char *argv[])
 		exit(0);
 	}
 
-	FindStorage();
-	bootcore_init(argc > 1 ? argv[1] : "");		
+	FindStorage();	
 	user_io_init((argc > 1) ? argv[1] : "");
 
 	scheduler_init();
diff --git a/user_io.cpp b/user_io.cpp
index 8d866e9..c923384 100644
--- a/user_io.cpp
+++ b/user_io.cpp
@@ -24,6 +24,7 @@
 #include "brightness.h"
 #include "sxmlc.h"
 #include "tzx2wav.h"
+#include "bootcore.h"
 
 #include "support.h"
 
@@ -501,6 +502,10 @@ void user_io_init(const char *path)
 	}
 
 	MiSTer_ini_parse();
+	if (cfg.bootcore[0] != '\0')
+	{
+		bootcore_init(path);
+	}
 	parse_video_mode();
 	FileLoadConfig("Volume.dat", &vol_att, 1);
 	vol_att &= 0x1F;