diff --git a/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp b/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp
index 9372c4d644..6a30bb90a6 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp
+++ b/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp
@@ -71,38 +71,45 @@ void cX11Window::XEventThread()
 			switch(event.type) {
 				case KeyPress:
 					key = XLookupKeysym((XKeyEvent*)&event, 0);
-					switch (key)
+					if (g_Config.bOSDHotKey)
 					{
-						case XK_3:
-							OSDChoice = 1;
-							// Toggle native resolution
-							g_Config.iEFBScale = g_Config.iEFBScale + 1;
-							if (g_Config.iEFBScale > 7) g_Config.iEFBScale = 0;
-							break;
-						case XK_4:
-							OSDChoice = 2;
-							// Toggle aspect ratio
-							g_Config.iAspectRatio = (g_Config.iAspectRatio + 1) & 3;
-							break;
-						case XK_5:
-							OSDChoice = 3;
-							// Toggle EFB copy
-							if (!g_Config.bEFBCopyEnable || g_Config.bCopyEFBToTexture)
-							{
-								g_Config.bEFBCopyEnable ^= true;
-								g_Config.bCopyEFBToTexture = false;
-							}
-							else
-							{
-								g_Config.bCopyEFBToTexture = !g_Config.bCopyEFBToTexture;
-							}
-							break;
-						case XK_6:
-							OSDChoice = 4;
-							g_Config.bDisableFog = !g_Config.bDisableFog;
-							break;
-						default:
-							break;
+						switch (key)
+						{
+							case XK_3:
+								OSDChoice = 1;
+								// Toggle native resolution
+								g_Config.iEFBScale = g_Config.iEFBScale + 1;
+								if (g_Config.iEFBScale > 7) g_Config.iEFBScale = 0;
+								break;
+
+							case XK_4:
+								OSDChoice = 2;
+								// Toggle aspect ratio
+								g_Config.iAspectRatio = (g_Config.iAspectRatio + 1) & 3;
+								break;
+
+							case XK_5:
+								OSDChoice = 3;
+								// Toggle EFB copy
+								if (!g_Config.bEFBCopyEnable || g_Config.bCopyEFBToTexture)
+								{
+									g_Config.bEFBCopyEnable ^= true;
+									g_Config.bCopyEFBToTexture = false;
+								}
+								else
+								{
+									g_Config.bCopyEFBToTexture = !g_Config.bCopyEFBToTexture;
+								}
+								break;
+
+							case XK_6:
+								OSDChoice = 4;
+								g_Config.bDisableFog = !g_Config.bDisableFog;
+								break;
+
+							default:
+								break;
+						}
 					}
 					if (g_Config.bFreeLook)
 					{
diff --git a/Source/Core/VideoCommon/Src/RenderBase.cpp b/Source/Core/VideoCommon/Src/RenderBase.cpp
index 577570c568..8e1d012fa2 100644
--- a/Source/Core/VideoCommon/Src/RenderBase.cpp
+++ b/Source/Core/VideoCommon/Src/RenderBase.cpp
@@ -91,6 +91,9 @@ Renderer::Renderer() : frame_data(NULL), bLastFrameDumped(false)
 #if defined _WIN32 || defined HAVE_LIBAV
 	bAVIDumping = false;
 #endif
+
+	OSDChoice = 0;
+	OSDTime = 0;
 }
 
 Renderer::~Renderer()
@@ -263,108 +266,109 @@ void Renderer::SetScreenshot(const char *filename)
 // Create On-Screen-Messages
 void Renderer::DrawDebugText()
 {
+	if (!g_Config.bOSDHotKey)
+		return;
+
 	// OSD Menu messages
-	if (g_ActiveConfig.bOSDHotKey)
+	if (OSDChoice > 0)
 	{
-		if (OSDChoice > 0)
-		{
-			OSDTime = Common::Timer::GetTimeMs() + 3000;
-			OSDChoice = -OSDChoice;
-		}
-		if ((u32)OSDTime > Common::Timer::GetTimeMs())
-		{
-			const char* res_text = "";
-			switch (g_ActiveConfig.iEFBScale)
-			{
-			case 0:
-				res_text = "Auto (fractional)";
-				break;
-			case 1:
-				res_text = "Auto (integral)";
-				break;
-			case 2:
-				res_text = "Native";
-				break;
-			case 3:
-				res_text = "1.5x";
-				break;
-			case 4:
-				res_text = "2x";
-				break;
-			case 5:
-				res_text = "2.5x";
-				break;
-			case 6:
-				res_text = "3x";
-				break;
-			case 7:
-				res_text = "4x";
-				break;
-			}
-
-			const char* ar_text = "";
-			switch(g_ActiveConfig.iAspectRatio)
-			{
-			case ASPECT_AUTO:
-				ar_text = "Auto";
-				break;
-			case ASPECT_FORCE_16_9:
-				ar_text = "16:9";
-				break;
-			case ASPECT_FORCE_4_3:
-				ar_text = "4:3";
-				break;
-			case ASPECT_STRETCH:
-				ar_text = "Stretch";
-				break;
-			}
-
-			const char* const efbcopy_text = g_ActiveConfig.bEFBCopyEnable ?
-				(g_ActiveConfig.bCopyEFBToTexture ? "to Texture" : "to RAM") : "Disabled";
-
-			// The rows
-			const std::string lines[] =
-			{
-				std::string("3: Internal Resolution: ") + res_text,
-				std::string("4: Aspect Ratio: ") + ar_text + (g_ActiveConfig.bCrop ? " (crop)" : ""),
-				std::string("5: Copy EFB: ") + efbcopy_text,
-				std::string("6: Fog: ") + (g_ActiveConfig.bDisableFog ? "Disabled" : "Enabled"),
-			};
-
-			enum { lines_count = sizeof(lines)/sizeof(*lines) };
-
-			std::string final_yellow, final_cyan;
-
-			// If there is more text than this we will have a collision
-			if (g_ActiveConfig.bShowFPS)
-			{
-				final_yellow = final_cyan = "\n\n";
-			}
-
-			// The latest changed setting in yellow
-			for (int i = 0; i != lines_count; ++i)
-			{
-				if (OSDChoice == -i - 1)
-					final_yellow += lines[i];
-				final_yellow += '\n';
-			}
-
-			// The other settings in cyan
-			for (int i = 0; i != lines_count; ++i)
-			{
-				if (OSDChoice != -i - 1)
-					final_cyan += lines[i];
-				final_cyan += '\n';
-			}
-
-			// Render a shadow
-			g_renderer->RenderText(final_cyan.c_str(), 21, 21, 0xDD000000);
-			g_renderer->RenderText(final_yellow.c_str(), 21, 21, 0xDD000000);
-			//and then the text
-			g_renderer->RenderText(final_cyan.c_str(), 20, 20, 0xFF00FFFF);
-			g_renderer->RenderText(final_yellow.c_str(), 20, 20, 0xFFFFFF00);
-		}
+		OSDTime = Common::Timer::GetTimeMs() + 3000;
+		OSDChoice = -OSDChoice;
 	}
+
+	if ((u32)OSDTime <= Common::Timer::GetTimeMs())
+		return;
+
+	const char* res_text = "";
+	switch (g_ActiveConfig.iEFBScale)
+	{
+	case 0:
+		res_text = "Auto (fractional)";
+		break;
+	case 1:
+		res_text = "Auto (integral)";
+		break;
+	case 2:
+		res_text = "Native";
+		break;
+	case 3:
+		res_text = "1.5x";
+		break;
+	case 4:
+		res_text = "2x";
+		break;
+	case 5:
+		res_text = "2.5x";
+		break;
+	case 6:
+		res_text = "3x";
+		break;
+	case 7:
+		res_text = "4x";
+		break;
+	}
+
+	const char* ar_text = "";
+	switch(g_ActiveConfig.iAspectRatio)
+	{
+	case ASPECT_AUTO:
+		ar_text = "Auto";
+		break;
+	case ASPECT_FORCE_16_9:
+		ar_text = "16:9";
+		break;
+	case ASPECT_FORCE_4_3:
+		ar_text = "4:3";
+		break;
+	case ASPECT_STRETCH:
+		ar_text = "Stretch";
+		break;
+	}
+
+	const char* const efbcopy_text = g_ActiveConfig.bEFBCopyEnable ?
+		(g_ActiveConfig.bCopyEFBToTexture ? "to Texture" : "to RAM") : "Disabled";
+
+	// The rows
+	const std::string lines[] =
+	{
+		std::string("3: Internal Resolution: ") + res_text,
+		std::string("4: Aspect Ratio: ") + ar_text + (g_ActiveConfig.bCrop ? " (crop)" : ""),
+		std::string("5: Copy EFB: ") + efbcopy_text,
+		std::string("6: Fog: ") + (g_ActiveConfig.bDisableFog ? "Disabled" : "Enabled"),
+	};
+
+	enum { lines_count = sizeof(lines)/sizeof(*lines) };
+
+	std::string final_yellow, final_cyan;
+
+	// If there is more text than this we will have a collision
+	if (g_ActiveConfig.bShowFPS)
+	{
+		final_yellow = final_cyan = "\n\n";
+	}
+
+	// The latest changed setting in yellow
+	for (int i = 0; i != lines_count; ++i)
+	{
+		if (OSDChoice == -i - 1)
+			final_yellow += lines[i];
+		final_yellow += '\n';
+	}
+
+	// The other settings in cyan
+	for (int i = 0; i != lines_count; ++i)
+	{
+		if (OSDChoice != -i - 1)
+			final_cyan += lines[i];
+		final_cyan += '\n';
+	}
+
+	// Render a shadow
+	g_renderer->RenderText(final_cyan.c_str(), 21, 21, 0xDD000000);
+	g_renderer->RenderText(final_yellow.c_str(), 21, 21, 0xDD000000);
+	//and then the text
+	g_renderer->RenderText(final_cyan.c_str(), 20, 20, 0xFF00FFFF);
+	g_renderer->RenderText(final_yellow.c_str(), 20, 20, 0xFFFFFF00);
 }
 
 // TODO: remove
diff --git a/Source/Core/VideoCommon/Src/RenderBase.h b/Source/Core/VideoCommon/Src/RenderBase.h
index 4da80c9752..5376577cbd 100644
--- a/Source/Core/VideoCommon/Src/RenderBase.h
+++ b/Source/Core/VideoCommon/Src/RenderBase.h
@@ -39,7 +39,7 @@
 
 // TODO: Move these out of here.
 extern int frameCount;
-extern int OSDChoice, OSDTime;
+extern int OSDChoice;
 
 extern bool bLastFrameDumped;