diff --git a/stepmania/src/Screen.cpp b/stepmania/src/Screen.cpp
index dbc86a051f..c9d96f698b 100644
--- a/stepmania/src/Screen.cpp
+++ b/stepmania/src/Screen.cpp
@@ -77,11 +77,6 @@ void Screen::BeginScreen()
 	this->RunCommands( THEME->GetMetricA(m_sName, "ScreenOnCommand") );
 }
 
-void Screen::ReloadScreen()
-{
-	SCREENMAN->SetNewScreen( m_sName );
-}
-
 void Screen::Update( float fDeltaTime )
 {
 	ActorFrame::Update( fDeltaTime );
diff --git a/stepmania/src/Screen.h b/stepmania/src/Screen.h
index b0fab781a3..c3fcf7adc7 100644
--- a/stepmania/src/Screen.h
+++ b/stepmania/src/Screen.h
@@ -47,9 +47,6 @@ public:
 
 	/* This is called when the screen is popped. */
 	virtual void EndScreen() { }
-	
-	/* Call this to reload the current screen. */
-	virtual void ReloadScreen();
 
 	virtual void Update( float fDeltaTime );
 	virtual bool OverlayInput( const InputEventPlus &input );
diff --git a/stepmania/src/ScreenOptionsEditCourse.cpp b/stepmania/src/ScreenOptionsEditCourse.cpp
index 1a35ec02f3..fd28a92f2b 100644
--- a/stepmania/src/ScreenOptionsEditCourse.cpp
+++ b/stepmania/src/ScreenOptionsEditCourse.cpp
@@ -166,7 +166,7 @@ void ScreenOptionsEditCourse::HandleScreenMessage( const ScreenMessage SM )
 				CourseEntry ce;
 				CourseUtil::MakeDefaultEditCourseEntry( ce );
 				pCourse->m_vEntries.insert( pCourse->m_vEntries.begin() + GetCourseEntryIndexWithFocus(), ce );
-				ReloadScreen();
+				SCREENMAN->SetNewScreen( this->m_sName ); // reload
 				break;
 			}
 			case CourseEntryAction_Delete:
@@ -178,7 +178,7 @@ void ScreenOptionsEditCourse::HandleScreenMessage( const ScreenMessage SM )
 				}
 				pCourse->m_vEntries.erase( pCourse->m_vEntries.begin() + GetCourseEntryIndexWithFocus() );
 				GAMESTATE->m_iEditCourseEntryIndex.Set( GAMESTATE->m_iEditCourseEntryIndex );
-				ReloadScreen();
+				SCREENMAN->SetNewScreen( this->m_sName ); // reload
 				break;
 			}
 			}
@@ -312,7 +312,7 @@ void ScreenOptionsEditCourse::ProcessMenuStart( const InputEventPlus &input )
 		CourseUtil::MakeDefaultEditCourseEntry( ce );
 		pCourse->m_vEntries.push_back( ce );
 		GAMESTATE->m_iEditCourseEntryIndex.Set( pCourse->m_vEntries.size()-1 );
-		ReloadScreen();
+		SCREENMAN->SetNewScreen( this->m_sName ); // reload
 	}
 	else if( iCurRow == (int)m_pRows.size()-1 )	// "done"
 	{
diff --git a/stepmania/src/ScreenOptionsManageCourses.cpp b/stepmania/src/ScreenOptionsManageCourses.cpp
index 8978ef288d..e48ace637f 100644
--- a/stepmania/src/ScreenOptionsManageCourses.cpp
+++ b/stepmania/src/ScreenOptionsManageCourses.cpp
@@ -163,11 +163,16 @@ void ScreenOptionsManageCourses::Init()
 
 	EDIT_MODE.Load( m_sName,"EditMode" );
 	GAMESTATE->m_MasterPlayerNumber = GAMESTATE->GetFirstHumanPlayer();
-	RebuildOptionRows();
 }
 
-void ScreenOptionsManageCourses::RebuildOptionRows()
+void ScreenOptionsManageCourses::BeginScreen()
 {
+	if( GAMESTATE->m_stEdit == STEPS_TYPE_INVALID  ||
+	    GAMESTATE->m_cdEdit == DIFFICULTY_INVALID )
+	{
+		SetNextCombination();
+	}
+	
 	vector<OptionRowHandler*> vHands;
 	
 	int iIndex = 0;
@@ -235,20 +240,7 @@ void ScreenOptionsManageCourses::RebuildOptionRows()
 	}
 	
 	ScreenOptions::InitMenu( vHands );
-	m_bForceRebuild = false;
-}
-
-void ScreenOptionsManageCourses::BeginScreen()
-{
-	if( GAMESTATE->m_stEdit == STEPS_TYPE_INVALID  ||
-	    GAMESTATE->m_cdEdit == DIFFICULTY_INVALID )
-	{
-		SetNextCombination();
-	}
 	
-	if( m_bForceRebuild )
-		RebuildOptionRows();
-
 	ScreenOptions::BeginScreen();
 	
 	// select the last chosen course
@@ -265,12 +257,6 @@ void ScreenOptionsManageCourses::BeginScreen()
 	AfterChangeRow( GAMESTATE->m_MasterPlayerNumber );
 }
 
-void ScreenOptionsManageCourses::ReloadScreen()
-{
-	m_bForceRebuild = true;
-	ScreenOptionsEditCourseSubMenu::ReloadScreen();
-}
-
 static LocalizedString COURSE_WILL_BE_LOST	( "ScreenOptionsManageCourses", "This course will be lost permanently." );
 static LocalizedString CONTINUE_WITH_DELETE	( "ScreenOptionsManageCourses", "Continue with delete?" );
 static LocalizedString ENTER_COURSE_NAME	( "ScreenOptionsManageCourses", "Enter a name for the course." );
@@ -288,7 +274,7 @@ void ScreenOptionsManageCourses::HandleScreenMessage( const ScreenMessage SM )
 		if( !pCourse->IsAnEdit() )
 			FILEMAN->Remove( pCourse->GetCacheFilePath() );
 		delete pCourse;
-		ReloadScreen();
+		SCREENMAN->SetNewScreen( this->m_sName ); // reload
 	}
 	else if( SM == SM_Failure )
 	{
@@ -340,7 +326,6 @@ void ScreenOptionsManageCourses::HandleScreenMessage( const ScreenMessage SM )
 			WriteCourse();
 
 			RefreshTrail();
-			m_bForceRebuild = true;
 			this->HandleScreenMessage( SM_GoToNextScreen );
 		}
 	}
@@ -362,7 +347,7 @@ void ScreenOptionsManageCourses::HandleScreenMessage( const ScreenMessage SM )
 			pCourse->m_sPath = sDir + sNewName + sExt;
 			pCourse->m_sMainTitle = sNewName;
 			WriteCourse();
-			ReloadScreen();
+			SCREENMAN->SetNewScreen( this->m_sName ); // reload
 		}
 	}
 	else if( SM == SM_BackFromContextMenu )
diff --git a/stepmania/src/ScreenOptionsManageCourses.h b/stepmania/src/ScreenOptionsManageCourses.h
index 4d60ddd1fb..027bac84e8 100644
--- a/stepmania/src/ScreenOptionsManageCourses.h
+++ b/stepmania/src/ScreenOptionsManageCourses.h
@@ -24,7 +24,6 @@ class ScreenOptionsManageCourses : public ScreenOptionsEditCourseSubMenu
 public:
 	void Init();
 	virtual void BeginScreen();
-	virtual void ReloadScreen();
 	virtual void HandleScreenMessage( const ScreenMessage SM );
 
 protected:
@@ -36,11 +35,9 @@ protected:
 
 private:
 	Course *GetCourseWithFocus() const;
-	void RebuildOptionRows();
 
 	vector<Course*> m_vpCourses;
 	ThemeMetricEnum<EditMode> EDIT_MODE;
-	bool m_bForceRebuild;
 };
 
 #endif
diff --git a/stepmania/src/ScreenOptionsManageEditSteps.cpp b/stepmania/src/ScreenOptionsManageEditSteps.cpp
index 9ac1c42a46..1e1284d31b 100644
--- a/stepmania/src/ScreenOptionsManageEditSteps.cpp
+++ b/stepmania/src/ScreenOptionsManageEditSteps.cpp
@@ -161,7 +161,7 @@ void ScreenOptionsManageEditSteps::HandleScreenMessage( const ScreenMessage SM )
 				return;
 			}
 
-			ReloadScreen();
+			SCREENMAN->SetNewScreen( this->m_sName ); // reload
 		}
 	}
 	else if( SM == SM_BackFromDelete )
@@ -174,7 +174,7 @@ void ScreenOptionsManageEditSteps::HandleScreenMessage( const ScreenMessage SM )
 			FILEMAN->Remove( pSteps->GetFilename() );
 			SONGMAN->DeleteSteps( pSteps );
 			GAMESTATE->m_pCurSteps[PLAYER_1].Set( NULL );
-			ReloadScreen();
+			SCREENMAN->SetNewScreen( this->m_sName ); // reload
 		}
 	}
 	else if( SM == SM_BackFromContextMenu )
diff --git a/stepmania/src/ScreenOptionsManageProfiles.cpp b/stepmania/src/ScreenOptionsManageProfiles.cpp
index e6b45fdd6c..87479b13fa 100644
--- a/stepmania/src/ScreenOptionsManageProfiles.cpp
+++ b/stepmania/src/ScreenOptionsManageProfiles.cpp
@@ -185,7 +185,7 @@ void ScreenOptionsManageProfiles::HandleScreenMessage( const ScreenMessage SM )
 			RString sNewName = ScreenTextEntry::s_sLastAnswer;
 			PROFILEMAN->RenameLocalProfile( GAMESTATE->m_sEditLocalProfileID, sNewName );
 
-			ReloadScreen();
+			SCREENMAN->SetNewScreen( this->m_sName ); // reload
 		}
 	}
 	else if( SM == SM_BackFromDeleteConfirm )
@@ -202,7 +202,7 @@ void ScreenOptionsManageProfiles::HandleScreenMessage( const ScreenMessage SM )
 
 			PROFILEMAN->DeleteLocalProfile( GetLocalProfileIDWithFocus() );
 			
-			ReloadScreen();
+			SCREENMAN->SetNewScreen( this->m_sName ); // reload
 		}
 	}
 	else if( SM == SM_BackFromClearConfirm )
@@ -211,7 +211,7 @@ void ScreenOptionsManageProfiles::HandleScreenMessage( const ScreenMessage SM )
 		{
 			GAMESTATE->GetEditLocalProfile()->InitAll();
 
-			ReloadScreen();
+			SCREENMAN->SetNewScreen( this->m_sName ); // reload
 		}
 	}
 	else if( SM == SM_BackFromContextMenu )