diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
index 7e3a5396b0..52a54070ed 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
@@ -541,6 +541,8 @@ void OpenGL_Update()
 #elif defined(_WIN32)
 	RECT rcWindow;
 	if (!EmuWindow::GetParentWnd()) {
+		if (!g_Config.bStretchToFit)
+			return;
 		GetWindowRect(EmuWindow::GetWnd(), &rcWindow);
 		rcWindow.top += 25;
 	}
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
index 41ccfa8513..ea4a56544b 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
@@ -576,6 +576,10 @@ void Renderer::FlushZBufferAlphaToTarget()
 		TextureMngr::DisableStage(i);
     GL_REPORT_ERRORD();
 
+	// setup the stencil to only accept pixels that have been written
+	glStencilFunc(GL_EQUAL, 1, 0xff);
+	glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
+
 	if(g_Config.bStretchToFit)
 	{
 		//TODO: Do Correctly in a bit
@@ -597,10 +601,6 @@ void Renderer::FlushZBufferAlphaToTarget()
 	}
 	else
 	{		
-		// setup the stencil to only accept pixels that have been written
-		glStencilFunc(GL_EQUAL, 1, 0xff);
-		glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
-
 		glBegin(GL_QUADS);
 		glTexCoord2f(0, 0); glVertex2f(-1,-1);
 		glTexCoord2f(0, (float)(GetTargetHeight())); glVertex2f(-1,1);