diff --git a/stepmania/src/ScreenTestFonts.cpp b/stepmania/src/ScreenTestFonts.cpp
index 5eafd935c0..f6dadb460b 100644
--- a/stepmania/src/ScreenTestFonts.cpp
+++ b/stepmania/src/ScreenTestFonts.cpp
@@ -73,11 +73,12 @@ void ScreenTestFonts::SetFont(CString font_)
 	SetText(curtext);
 }
 
-void ScreenTestFonts::Draw()
+void ScreenTestFonts::DrawPrimitives()
 {
-	/* Draw this manually, so we can breakpoint here ... */
+	Screen::DrawPrimitives();
+
+	/* Draw this manually, so we can breakpoint here. */
 	txt.Draw();
-	Screen::Draw();
 }
 
 
diff --git a/stepmania/src/ScreenTestFonts.h b/stepmania/src/ScreenTestFonts.h
index ea78244396..545dfa537d 100644
--- a/stepmania/src/ScreenTestFonts.h
+++ b/stepmania/src/ScreenTestFonts.h
@@ -12,7 +12,7 @@ public:
 	virtual void Init();
 
 	void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
-	void Draw();
+	void DrawPrimitives();
 	void HandleScreenMessage( const ScreenMessage SM );
 
 	void SetText(CString txt);