diff --git a/src/gl/renderer/gl_renderer.cpp b/src/gl/renderer/gl_renderer.cpp
index ae7c7d93ce..84d02159f8 100644
--- a/src/gl/renderer/gl_renderer.cpp
+++ b/src/gl/renderer/gl_renderer.cpp
@@ -286,9 +286,6 @@ void FGLRenderer::Begin2D()
 {
 	if (FGLRenderBuffers::IsEnabled())
 	{
-		if (!mDrawingScene2D) // For when there's no scene rendered (main menu and intermission)
-			SetOutputViewport(nullptr);
-			
 		mBuffers->Setup(mScreenViewport.width, mScreenViewport.height, mSceneViewport.width, mSceneViewport.height);
 		if (mDrawingScene2D)
 			mBuffers->BindSceneFB();
diff --git a/src/gl/system/gl_framebuffer.cpp b/src/gl/system/gl_framebuffer.cpp
index beaf3bcf32..096a33393a 100644
--- a/src/gl/system/gl_framebuffer.cpp
+++ b/src/gl/system/gl_framebuffer.cpp
@@ -187,6 +187,8 @@ void OpenGLFrameBuffer::Update()
 	DrawRateStuff();
 	GLRenderer->Flush();
 
+	GLRenderer->SetOutputViewport(nullptr);
+
 	if (gl_draw_sync || !swapped)
 	{
 		Swap();