diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp
index c30b915c019..6a06f4d715a 100644
--- a/intern/ghost/intern/GHOST_WindowWin32.cpp
+++ b/intern/ghost/intern/GHOST_WindowWin32.cpp
@@ -434,16 +434,6 @@ GHOST_TSuccess GHOST_WindowWin32::setOrder(GHOST_TWindowOrder order)
 
 GHOST_TSuccess GHOST_WindowWin32::swapBuffers()
 {
-	// adding a glFinish() here is to prevent Geforce in 'full scene antialias' mode
-	// from antialising the Blender window. Officially a swapbuffers does a glFinish
-	// itself, so this feels really like a hack... but it won't harm. (ton)
-	// 
-	// disabled this because it is a performance killer for the game engine, glFinish
-	// forces synchronization with the graphics card and calling it is strongly
-	// discouraged for good performance. (brecht)
-	//
-	// glFinish();
-
 	return ::SwapBuffers(m_hDC) == TRUE ? GHOST_kSuccess : GHOST_kFailure;
 }
 
diff --git a/source/blender/src/ghostwinlay.c b/source/blender/src/ghostwinlay.c
index 7179f2fae57..a8bf39ccc29 100644
--- a/source/blender/src/ghostwinlay.c
+++ b/source/blender/src/ghostwinlay.c
@@ -478,6 +478,16 @@ void window_make_active(Window *win) {
 }
 
 void window_swap_buffers(Window *win) {
+	// adding a glFinish() here is to prevent Geforce in 'full scene antialias' mode
+	// from antialising the Blender window. Officially a swapbuffers does a glFinish
+	// itself, so this feels really like a hack... but it won't harm. (ton)
+	// 
+	// moved it here from ghost because it is a performance killer for the game engine,
+	// glFinish forces synchronization with the graphics card and calling it is strongly
+	// discouraged for good performance. (brecht)
+	//
+	glFinish();
+
 	GHOST_SwapWindowBuffers(win->ghostwin);
 }