diff --git a/stepmania/src/ScreenOptionsManageProfiles.cpp b/stepmania/src/ScreenOptionsManageProfiles.cpp
index 97bdaaea48..4ae525b5e9 100644
--- a/stepmania/src/ScreenOptionsManageProfiles.cpp
+++ b/stepmania/src/ScreenOptionsManageProfiles.cpp
@@ -109,8 +109,11 @@ void ScreenOptionsManageProfiles::BeginScreen()
 	{
 		OptionRowDefinition def;
 		OptionRowHandler *pHand = OptionRowHandlerUtil::Make( ParseCommands("gamecommand;screen,ScreenOptionsEditProfile;name,Create New"), def );
-		vDefs.push_back( def );
+		pHand->m_Def.m_layoutType = LAYOUT_SHOW_ALL_IN_ROW;
+		pHand->m_Def.m_bAllowThemeTitle = false;
+		pHand->m_Def.m_bAllowThemeItems = false;
 		OptionRowHandlers.push_back( pHand );
+		vDefs.push_back( pHand->m_Def );
 
 		// FIXME
 		// gc.Load( iIndex++,  );
@@ -126,9 +129,12 @@ void ScreenOptionsManageProfiles::BeginScreen()
 		OptionRowDefinition def;
 		CString sCommand = ssprintf( "gamecommand;screen,ScreenOptionsEditProfile;profileid,%s;name,%s", s->c_str(), pProfile->m_sDisplayName.c_str() );
 		OptionRowHandler *pHand = OptionRowHandlerUtil::Make( ParseCommands(sCommand), def );
-		def.m_sName = ssprintf( "%d", iIndex );
-		vDefs.push_back( def );
+		pHand->m_Def.m_layoutType = LAYOUT_SHOW_ALL_IN_ROW;
+		pHand->m_Def.m_bAllowThemeTitle = false;
+		pHand->m_Def.m_bAllowThemeItems = false;
+		pHand->m_Def.m_sName = ssprintf( "%d", iIndex );
 		OptionRowHandlers.push_back( pHand );
+		vDefs.push_back( pHand->m_Def );
 
 		// FIXME
 		// gc.Load( iIndex++,  );
diff --git a/stepmania/src/ScreenOptionsMaster.cpp b/stepmania/src/ScreenOptionsMaster.cpp
index 7e82f45cd6..0fb882d2f9 100644
--- a/stepmania/src/ScreenOptionsMaster.cpp
+++ b/stepmania/src/ScreenOptionsMaster.cpp
@@ -50,7 +50,6 @@ void ScreenOptionsMaster::Init()
 	ScreenOptions::Init();
 
 	vector<OptionRowDefinition> OptionRowDefs;
-	OptionRowDefs.resize( asLineNames.size() );
 	vector<OptionRowHandler*> OptionRowHandlers;
 	for( unsigned i = 0; i < asLineNames.size(); ++i )
 	{
@@ -60,11 +59,12 @@ void ScreenOptionsMaster::Init()
 		Commands cmds;
 		ParseCommands( sRowCommands, cmds );
 
-		OptionRowDefinition &def = OptionRowDefs[i];
+		OptionRowDefinition def;
 		OptionRowHandler *pHand = OptionRowHandlerUtil::Make( cmds, def );
 		if( pHand == NULL )
 			RageException::Throw( "Invalid OptionRowHandler '%s' in %s::Line%i", cmds.GetOriginalCommandString().c_str(), m_sName.c_str(), i );
 		OptionRowHandlers.push_back( pHand );
+		OptionRowDefs.push_back( pHand->m_Def );
 	}
 
 	ASSERT( OptionRowHandlers.size() == asLineNames.size() );