diff --git a/libmupen64plus/mupen64plus-video-jabo/Config.h b/libmupen64plus/mupen64plus-video-jabo/Config.h
index b9f77cfe1b..cd4f988e32 100644
--- a/libmupen64plus/mupen64plus-video-jabo/Config.h
+++ b/libmupen64plus/mupen64plus-video-jabo/Config.h
@@ -5,6 +5,7 @@
 
 BOOL Config_Open();
 int Config_ReadInt(const char *itemname, const char *desc, int def_value, BOOL create=TRUE, BOOL isBoolean=TRUE);
+void Config_ReadScreenResolution(int * width, int * height);
 
 
 #endif /* CONFIG_H */
\ No newline at end of file
diff --git a/libmupen64plus/mupen64plus-video-jabo/config.cpp b/libmupen64plus/mupen64plus-video-jabo/config.cpp
index 8c905a99d7..962b890f22 100644
--- a/libmupen64plus/mupen64plus-video-jabo/config.cpp
+++ b/libmupen64plus/mupen64plus-video-jabo/config.cpp
@@ -25,6 +25,12 @@ int Config_ReadScreenInt(const char *itemname)
     return ConfigGetParamInt(video_general_section, itemname);
 }
 
+void Config_ReadScreenResolution(int * width, int * height)
+{
+    *width = ConfigGetParamInt(video_general_section, "ScreenWidth");
+    *height = ConfigGetParamInt(video_general_section, "ScreenHeight");
+}
+
 BOOL Config_ReadInt(const char *itemname, const char *desc, int def_value, int create, int isBoolean)
 {
     //VLOG("Getting value %s", itemname);
diff --git a/libmupen64plus/mupen64plus-video-jabo/main.cpp b/libmupen64plus/mupen64plus-video-jabo/main.cpp
index 62198f5c41..d20ee51fb6 100644
--- a/libmupen64plus/mupen64plus-video-jabo/main.cpp
+++ b/libmupen64plus/mupen64plus-video-jabo/main.cpp
@@ -403,8 +403,21 @@ EXPORT int CALL InitiateGFX(GFX_INFO Gfx_Info)
 		case 4: new_options_val |= 0x00000100; break;
 	}
 
-	// Force 800x600 for now
-	new_options_val |= 0x00000004;
+	int width, height;
+	Config_ReadScreenResolution(&width,&height);
+	if (width == 320 && height == 240) { new_options_val |= 0x00000000; }
+	else if (width == 400 && height == 300) { new_options_val |= 0x00000001; } 
+	else if (width == 512 && height == 384) { new_options_val |= 0x00000002; } 
+	else if (width == 640 && height == 480) { new_options_val |= 0x00000003; } 
+	else if (width == 800 && height == 600) { new_options_val |= 0x00000004; } 
+	else if (width == 1024 && height == 768) { new_options_val |= 0x00000005; } 
+	else if (width == 1152 && height == 864) { new_options_val |= 0x00000006; } 
+	else if (width == 1280 && height == 960) { new_options_val |= 0x00000007; } 
+	else if (width == 1600 && height == 1200) { new_options_val |= 0x00000008; } 
+	else if (width == 848 && height == 480) { new_options_val |= 0x00000009; } 
+	else if (width == 1024 && height == 576) { new_options_val |= 0x0000000a; } 
+	else if (width == 1380 && height == 768) { new_options_val |= 0x0000000b; } 
+	else { /* will pick 320x240 */ }
 
 	DWORD new_initflags_val = 0x00e00000;
 	if (settings.direct3d_transformation_pipeline == TRUE) { new_initflags_val = 0x00a00000; }
@@ -578,7 +591,7 @@ DWORD WINAPI ThreadProc( LPVOID lpParam )
 	char *pString = (char *)(lpParam);
 	RegisterDLLWindowClass("InjectedDLLWindowClass");
 	hWnd_jabo = CreateWindowEx (0, "InjectedDLLWindowClass", pString, WS_OVERLAPPEDWINDOW, 300, 300, 400, 300, NULL, NULL,inj_hModule, NULL );
-	ShowWindow (hWnd_jabo, SW_HIDE);
+	ShowWindow (hWnd_jabo, SW_NORMAL);
     while (GetMessage (&messages, NULL, 0, 0))
     {
 		TranslateMessage(&messages);
diff --git a/output/dll/mupen64plus-video-jabo.dll b/output/dll/mupen64plus-video-jabo.dll
index 48ec045e70..a6298ba996 100644
Binary files a/output/dll/mupen64plus-video-jabo.dll and b/output/dll/mupen64plus-video-jabo.dll differ