diff --git a/stepmania/src/RageDisplay_D3D.cpp b/stepmania/src/RageDisplay_D3D.cpp
index 29ea05f494..9ca21ea8df 100644
--- a/stepmania/src/RageDisplay_D3D.cpp
+++ b/stepmania/src/RageDisplay_D3D.cpp
@@ -281,6 +281,8 @@ RageDisplay_D3D::~RageDisplay_D3D()
 {
 	LOG->Trace( "RageDisplay_D3D::~RageDisplay()" );
 
+	GraphicsWindow::Shutdown();
+
 	if( g_pd3dDevice )
 	{
 		g_pd3dDevice->Release();
@@ -293,8 +295,6 @@ RageDisplay_D3D::~RageDisplay_D3D()
 		g_pd3d = NULL;
 	}
 
-	GraphicsWindow::Shutdown();
-
 	/* Even after we call Release(), D3D may still affect our window.  It seems to subclass
 	 * the window, and never release it.  Free the DLL after destroying the window. */
 #if !defined(XBOX)