diff --git a/stepmania/src/HelpDisplay.cpp b/stepmania/src/HelpDisplay.cpp
index aa28712b5c..1fe68bb2cb 100644
--- a/stepmania/src/HelpDisplay.cpp
+++ b/stepmania/src/HelpDisplay.cpp
@@ -6,8 +6,6 @@
 #include "ThemeManager.h"
 #include "ActorUtil.h"
 
-#define TIP_SHOW_TIME			THEME->GetMetricF(m_sName,"TipShowTime")
-
 
 HelpDisplay::HelpDisplay()
 {
@@ -25,6 +23,13 @@ void HelpDisplay::Load()
 	m_fSecsUntilSwitch = TIP_SHOW_TIME;
 }
 
+void HelpDisplay::SetName( const CString &sName, const CString &sID )
+{
+	ActorFrame::SetName( sName, sID );
+
+	TIP_SHOW_TIME.Load( m_sName, "TipShowTime" );
+}
+
 void HelpDisplay::SetTips( const CStringArray &arrayTips, const CStringArray &arrayTipsAlt )
 { 
 	ASSERT( arrayTips.size() == arrayTipsAlt.size() );
diff --git a/stepmania/src/HelpDisplay.h b/stepmania/src/HelpDisplay.h
index 794a989ad2..62cf17e634 100644
--- a/stepmania/src/HelpDisplay.h
+++ b/stepmania/src/HelpDisplay.h
@@ -5,6 +5,7 @@
 
 #include "ActorFrame.h"
 #include "BitmapText.h"
+#include "ThemeMetric.h"
 
 
 class HelpDisplay : public ActorFrame
@@ -16,8 +17,11 @@ public:
 	void SetTips( const CStringArray &arrayTips, const CStringArray &arrayTipsAlt );
 
 	virtual void Update( float fDeltaTime );
+	virtual void SetName( const CString &sName, const CString &sID = "" );
 
 protected:
+	ThemeMetric<float> TIP_SHOW_TIME;
+
 	BitmapText m_textTip;
 
 	CStringArray m_arrayTips, m_arrayTipsAlt;