diff --git a/stepmania/src/RageDisplay.cpp b/stepmania/src/RageDisplay.cpp
index 677f04f85f..6d7c344820 100644
--- a/stepmania/src/RageDisplay.cpp
+++ b/stepmania/src/RageDisplay.cpp
@@ -380,9 +380,11 @@ HRESULT RageDisplay::BeginFrame()
 
 
 	// Don't tile texture coords.  This creates ugly wrapping artifacts on textures that have to be rescaled.
-    m_pd3dDevice->SetTextureStageState( 0, D3DTSS_ADDRESSU, D3DTADDRESS_BORDER );
-    m_pd3dDevice->SetTextureStageState( 0, D3DTSS_ADDRESSV, D3DTADDRESS_BORDER );
-    m_pd3dDevice->SetTextureStageState( 0, D3DTSS_BORDERCOLOR, D3DCOLOR_ARGB(0,0,0,0) );
+	DisableTextureWrapping();
+    
+	// m_pd3dDevice->SetTextureStageState( 0, D3DTSS_ADDRESSU, D3DTADDRESS_BORDER   );
+    // m_pd3dDevice->SetTextureStageState( 0, D3DTSS_ADDRESSV, D3DTADDRESS_BORDER   );
+    // m_pd3dDevice->SetTextureStageState( 0, D3DTSS_BORDERCOLOR, D3DCOLOR_ARGB(0,0,0,0) );
 
 
 	m_pd3dDevice->SetVertexShader( D3DFVF_RAGEVERTEX );
@@ -803,9 +805,9 @@ void RageDisplay::DisableTextureWrapping()
 	m_pd3dDevice->GetTextureStageState( 0, D3DTSS_ADDRESSU, &dw0 );
 	m_pd3dDevice->GetTextureStageState( 0, D3DTSS_ADDRESSV, &dw1 );
 
-	if( dw0!=D3DTADDRESS_BORDER || dw1!=D3DTADDRESS_BORDER )
+	if( dw0!=D3DTADDRESS_CLAMP  || dw1!=D3DTADDRESS_CLAMP  )
 		FlushQueue();
 
-    m_pd3dDevice->SetTextureStageState( 0, D3DTSS_ADDRESSU, D3DTADDRESS_BORDER );
-    m_pd3dDevice->SetTextureStageState( 0, D3DTSS_ADDRESSV, D3DTADDRESS_BORDER );
+    m_pd3dDevice->SetTextureStageState( 0, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP  );
+    m_pd3dDevice->SetTextureStageState( 0, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP  );
 }