diff --git a/fpga_io.cpp b/fpga_io.cpp
index b30911f..fdfc098 100644
--- a/fpga_io.cpp
+++ b/fpga_io.cpp
@@ -9,9 +9,11 @@
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
+
 #include "fpga_io.h"
 #include "file_io.h"
 #include "input.h"
+#include "osd.h"
 
 #include "fpga_base_addr_ac5.h"
 #include "fpga_manager.h"
@@ -448,6 +450,7 @@ static int make_env(const char *name, const char *cfg)
 
 int fpga_load_rbf(const char *name, const char *cfg)
 {
+	OsdDisable();
 	static char path[1024];
 	int ret = 0;
 
diff --git a/menu.cpp b/menu.cpp
index 00c68c8..c4e5e4b 100644
--- a/menu.cpp
+++ b/menu.cpp
@@ -4083,12 +4083,10 @@ void HandleUI(void)
 		}
 
 		// close OSD now as the new core may not even have one
-		OsdDisable();
 		fpga_load_rbf(SelectedRBF);
 		break;
 
 	case MENU_CORE_FILE_SELECTED2:
-		OsdDisable();
 		fpga_load_rbf(SelectedRBF, SelectedPath);
 		menustate = MENU_NONE1;
 		break;
diff --git a/user_io.cpp b/user_io.cpp
index f45733b..33e8bfb 100644
--- a/user_io.cpp
+++ b/user_io.cpp
@@ -1539,7 +1539,6 @@ void user_io_send_buttons(char force)
 			if ((key_map & BUTTON2) && !(map & BUTTON2))
 			{
 				const char *name = get_rbf_name();
-				OsdDisable();
 				fpga_load_rbf(name[0] ? name : "Archie.rbf");
 			}
 		}
@@ -2169,7 +2168,6 @@ void user_io_poll()
 
 	if (!coldreset_req && prev_coldreset_req)
 	{
-		OsdDisable();
 		fpga_load_rbf("menu.rbf");
 	}