diff --git a/src/gfx.c b/src/gfx.c
index 0803f59a..dfb438e2 100644
--- a/src/gfx.c
+++ b/src/gfx.c
@@ -89,9 +89,6 @@ void gfxInit(void)
 	#if GFX_USE_GDISP
 		_gdispInit();
 	#endif
-	#if GFX_USE_GWIN
-		_gwinInit();
-	#endif
 	#if GFX_USE_GINPUT
 		_ginputInit();
 	#endif
@@ -101,6 +98,9 @@ void gfxInit(void)
 	#if GFX_USE_GAUDIO
 		_gaudioInit();
 	#endif
+	#if GFX_USE_GWIN
+		_gwinInit();
+	#endif
 }
 
 void gfxDeinit(void)
@@ -110,6 +110,9 @@ void gfxDeinit(void)
 	initDone = FALSE;
 
 	// We deinitialise the opposite way as we initialised
+	#if GFX_USE_GWIN
+		_gwinDeinit();
+	#endif
 	#if GFX_USE_GAUDIN
 		_gaudioDeinit();
 	#endif
@@ -119,9 +122,6 @@ void gfxDeinit(void)
 	#if GFX_USE_GINPUT
 		_ginputDeinit();
 	#endif
-	#if GFX_USE_GWIN
-		_gwinDeinit();
-	#endif
 	#if GFX_USE_GDISP
 		_gdispDeinit();
 	#endif