diff --git a/Core/Config.h b/Core/Config.h
index d1b7da5eeb..ed57ec93fa 100644
--- a/Core/Config.h
+++ b/Core/Config.h
@@ -56,6 +56,7 @@ public:
 	bool bUseVBO;
 	int iWindowZoom;  // for Windows
 	bool SSAntiAlaising; //for Windows, too
+	bool bDisableG3DLog;
 
 	// Sound
 	bool bEnableSound;
diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp
index 38eed10d75..3bacff84fc 100644
--- a/Windows/WndMainWindow.cpp
+++ b/Windows/WndMainWindow.cpp
@@ -507,6 +507,14 @@ namespace MainWindow
 				g_Config.SSAntiAlaising = !g_Config.SSAntiAlaising;
 				UpdateMenus();
 				break;
+			case ID_OPTIONS_DISABLEG3DLOG:
+				g_Config.bDisableG3DLog = !g_Config.bDisableG3DLog;
+				if (!g_Config.bDisableG3DLog )
+					LogManager::GetInstance()->SetEnable(LogTypes::G3D, true);
+				else 
+					LogManager::GetInstance()->SetEnable(LogTypes::G3D, false);
+				UpdateMenus();
+				break;
 			case ID_OPTIONS_CONTROLS:
 				DialogManager::EnableAll(FALSE);
 				DialogBox(hInst, (LPCTSTR)IDD_CONTROLS, hWnd, (DLGPROC)Controls);
@@ -653,6 +661,7 @@ namespace MainWindow
 		CHECKITEM(ID_OPTIONS_SIMPLE2XSSAA, g_Config.SSAntiAlaising);
 		CHECKITEM(ID_EMULATION_RUNONLOAD, g_Config.bAutoRun);
 		CHECKITEM(ID_OPTIONS_USEVBO, g_Config.bUseVBO);
+		CHECKITEM(ID_OPTIONS_DISABLEG3DLOG, g_Config.bDisableG3DLog);
 
 		UINT enable = !Core_IsStepping() ? MF_GRAYED : MF_ENABLED;
 		EnableMenuItem(menu,ID_EMULATION_RUN, g_State.bEmuThreadStarted ? enable : MF_GRAYED);
diff --git a/Windows/ppsspp.rc b/Windows/ppsspp.rc
index b285c94183..c9b36e8724 100644
--- a/Windows/ppsspp.rc
+++ b/Windows/ppsspp.rc
@@ -261,6 +261,7 @@ BEGIN
         MENUITEM "&Wireframe (experimental)",   ID_OPTIONS_WIREFRAME
         MENUITEM "&Display Raw Framebuffer",    ID_OPTIONS_DISPLAYRAWFRAMEBUFFER
         MENUITEM "&Show Debug Statistics",      ID_OPTIONS_SHOWDEBUGSTATISTICS
+				MENUITEM "&Disable G3D Log",            ID_OPTIONS_DISABLEG3DLOG
         MENUITEM SEPARATOR
         MENUITEM "Screen &1x\tCtrl+1",          ID_OPTIONS_SCREEN1X
         MENUITEM "Screen &2x\tCtrl+2",          ID_OPTIONS_SCREEN2X
diff --git a/Windows/resource.h b/Windows/resource.h
index 5fbfb9d2f3..102ce27357 100644
--- a/Windows/resource.h
+++ b/Windows/resource.h
@@ -256,6 +256,7 @@
 #define ID_DEBUG_DUMPNEXTFRAME          40132
 #define ID_OPTIONS_SIMPLE2XSSAA         40133
 #define ID_OPTIONS_USEVBO               40134
+#define ID_OPTIONS_DISABLEG3DLOG        40135
 #define IDC_STATIC                      -1
 
 // Next default values for new objects