diff --git a/stepmania/src/ScreenOptionsManageCourses.cpp b/stepmania/src/ScreenOptionsManageCourses.cpp
index c45de89dec..90c3401586 100644
--- a/stepmania/src/ScreenOptionsManageCourses.cpp
+++ b/stepmania/src/ScreenOptionsManageCourses.cpp
@@ -12,6 +12,7 @@
 #include "Difficulty.h"
 #include "CourseUtil.h"
 #include "LocalizedString.h"
+#include "OptionRowHandler.h"
 
 static void RefreshTrail()
 {
@@ -148,17 +149,16 @@ void ScreenOptionsManageCourses::BeginScreen()
 	vector<OptionRowDefinition> vDefs;
 	vector<OptionRowHandler*> vHands;
 
-	OptionRowDefinition def;
-	def.m_layoutType = LAYOUT_SHOW_ONE_IN_ROW;
-
 	int iIndex = 0;
 	
 	{
+		vHands.push_back( OptionRowHandlerUtil::MakeNull() );
+		OptionRowDefinition &def = vHands.back()->m_Def;
+		def.m_layoutType = LAYOUT_SHOW_ONE_IN_ROW;
 		def.m_sName = "";
 		def.m_vsChoices.clear();
 		def.m_vsChoices.push_back( "Create New" );
 		vDefs.push_back( def );
-		vHands.push_back( NULL );
 		iIndex++;
 	}
 
@@ -183,6 +183,9 @@ void ScreenOptionsManageCourses::BeginScreen()
 
 	FOREACH_CONST( Course*, m_vpCourses, c )
 	{
+		vHands.push_back( OptionRowHandlerUtil::MakeNull() );
+		OptionRowDefinition &def = vHands.back()->m_Def;
+
 		switch( EDIT_MODE.GetValue() )
 		{
 		default:
@@ -200,11 +203,10 @@ void ScreenOptionsManageCourses::BeginScreen()
 		}
 
 		def.m_sName = ssprintf("%d",iIndex) + " " + def.m_sName;
-
+		def.m_layoutType = LAYOUT_SHOW_ONE_IN_ROW;
 		def.m_vsChoices.clear();
 		def.m_vsChoices.push_back( (*c)->GetDisplayFullTitle() );
 		vDefs.push_back( def );
-		vHands.push_back( NULL );
 		iIndex++;
 	}
 
diff --git a/stepmania/src/ScreenOptionsManageEditSteps.cpp b/stepmania/src/ScreenOptionsManageEditSteps.cpp
index 9cad5c5a0f..25d91a5452 100644
--- a/stepmania/src/ScreenOptionsManageEditSteps.cpp
+++ b/stepmania/src/ScreenOptionsManageEditSteps.cpp
@@ -12,6 +12,7 @@
 #include "RageUtil.h"
 #include "RageFileManager.h"
 #include "LocalizedString.h"
+#include "OptionRowHandler.h"
 
 AutoScreenMessage( SM_BackFromRename )
 AutoScreenMessage( SM_BackFromDelete )
@@ -76,19 +77,18 @@ void ScreenOptionsManageEditSteps::BeginScreen()
 	vector<OptionRowDefinition> vDefs;
 	vector<OptionRowHandler*> vHands;
 
-	OptionRowDefinition def;
-	def.m_layoutType = LAYOUT_SHOW_ONE_IN_ROW;
-	def.m_bOneChoiceForAllPlayers = true;
-
 	int iIndex = 0;
 	
 	{
+		vHands.push_back( OptionRowHandlerUtil::MakeNull() );
+		OptionRowDefinition &def = vHands.back()->m_Def;
+		def.m_layoutType = LAYOUT_SHOW_ONE_IN_ROW;
+		def.m_bOneChoiceForAllPlayers = true;
 		def.m_sName = "Create New Edit Steps";
 		def.m_sExplanationName = "Create New Edit Steps";
 		def.m_vsChoices.clear();
 		def.m_vsChoices.push_back( "" );
 		vDefs.push_back( def );
-		vHands.push_back( NULL );
 		iIndex++;
 	}
 
@@ -96,6 +96,8 @@ void ScreenOptionsManageEditSteps::BeginScreen()
 
 	FOREACH_CONST( Steps*, m_vpSteps, s )
 	{
+		vHands.push_back( OptionRowHandlerUtil::MakeNull() );
+		OptionRowDefinition &def = vHands.back()->m_Def;
 		def.m_sName = (*s)->GetDescription();
 		def.m_bAllowThemeTitle = false;	// not themable
 		def.m_sExplanationName = "Edit Steps";
@@ -104,7 +106,6 @@ void ScreenOptionsManageEditSteps::BeginScreen()
 		def.m_vsChoices.push_back( sType );
 		def.m_bAllowThemeItems = false;	// already themed
 		vDefs.push_back( def );
-		vHands.push_back( NULL );
 		iIndex++;
 	}