diff --git a/libmupen64plus/mupen64plus-video-jabo/main.cpp b/libmupen64plus/mupen64plus-video-jabo/main.cpp
index 25f39dcc9c..d7fdb12e31 100644
--- a/libmupen64plus/mupen64plus-video-jabo/main.cpp
+++ b/libmupen64plus/mupen64plus-video-jabo/main.cpp
@@ -355,6 +355,7 @@ EXPORT void CALL ChangeWindow (void)
 // NOTE: NEW GFX_INFO vs old
 EXPORT int CALL InitiateGFX(GFX_INFO Gfx_Info)
 {
+	while (hWnd_jabo == NULL);
 	LOG("API WRAPPER:\t InitiateGFX")
 
 	Config_Open();