diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
index f0a134dc5d..b52db29b20 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
@@ -295,7 +295,8 @@ THREAD_RETURN XEventThread(void *pArg)
 				case ClientMessage:
 					if ((unsigned long) event.xclient.data.l[0] == XInternAtom(GLWin.evdpy, "WM_DELETE_WINDOW", False))
 						g_VideoInitialize.pCoreMessage(WM_USER_STOP);
-					if ((unsigned long) event.xclient.data.l[0] == XInternAtom(GLWin.evdpy, "RESIZE", False))
+					if ((unsigned long) event.xclient.data.l[0] == XInternAtom(GLWin.evdpy, "RESIZE", False) &&
+							!g_ActiveConfig.bAdjustWindowSize)
 						XMoveResizeWindow(GLWin.evdpy, GLWin.win, event.xclient.data.l[1],
 							   	event.xclient.data.l[2], event.xclient.data.l[3], event.xclient.data.l[4]);
 					break;
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
index 2448e9a925..ff2a718c26 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
@@ -1607,6 +1607,10 @@ void Renderer::SetWindowSize(int width, int height)
 	// Scale the window size by the EFB scale.
 	CalculateTargetScale(width, height, width, height);
 
+#if defined HAVE_X11 && HAVE_X11
+	if (s_backbuffer_width != width || s_backbuffer_height != height)
+		XMoveResizeWindow(GLWin.evdpy, GLWin.win, GLWin.x, GLWin.y, width, height);
+#endif
 	g_VideoInitialize.pRequestWindowSize(width, height);
 }