diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index 9629d9fb12..1b2891ef7e 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -5,9 +5,14 @@ from StepMania 4 alpha 5 to sm-ssc v1.2.5, see Changelog_sm-ssc.txt.
 ________________________________________________________________________________
 
 ================================================================================
-StepMania 5.0 alpha 1a | 201201??
+StepMania 5.0 alpha 1a | 201202??
 --------------------------------------------------------------------------------
 
+2012/02/08
+----------
+* [ScreenOptionsMaster] Added StepsRowLayoutType metric.
+  (Valid values are "ShowAllInRow" or "ShowOneInRow".) [AJ]
+
 2012/01/23
 ----------
 * [Player] Tap Note Scores (tns) can now be "AvoidMine" or "HitMine" in
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index f537e65434..b135f3835a 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -2239,6 +2239,7 @@ Class="ScreenOptionsMaster"
 
 NoteSkinSortOrder=""
 StepsUseChartName=false
+StepsRowLayoutType="ShowAllInRow"
 
 # ExitItem is an exit row with the "Exit" text as a menu item; ExitTitle
 # uses the menu title.
diff --git a/src/OptionRowHandler.cpp b/src/OptionRowHandler.cpp
index ebcee7a186..a02925be05 100644
--- a/src/OptionRowHandler.cpp
+++ b/src/OptionRowHandler.cpp
@@ -28,7 +28,8 @@
 #define ENTRY_MODE(s,i)		THEME->GetMetric ("ScreenOptionsMaster",ssprintf("%s,%i",(s).c_str(),(i+1)))
 #define ENTRY_DEFAULT(s)	THEME->GetMetric ("ScreenOptionsMaster",(s) + "Default")
 #define NOTE_SKIN_SORT_ORDER	THEME->GetMetric ("ScreenOptionsMaster","NoteSkinSortOrder")
-#define STEPS_USE_CHART_NAME THEME->GetMetricB("ScreenOptionsMaster","StepsUseChartName")
+#define STEPS_ROW_LAYOUT_TYPE	THEME->GetMetric("ScreenOptionsMaster","StepsRowLayoutType")
+#define STEPS_USE_CHART_NAME	THEME->GetMetricB("ScreenOptionsMaster","StepsUseChartName")
 
 static const char *SelectTypeNames[] = {
 	"SelectOne",
@@ -423,6 +424,7 @@ class OptionRowHandlerListSteps : public OptionRowHandlerList
 		else if( GAMESTATE->IsCourseMode() && GAMESTATE->m_pCurCourse )   // playing a course
 		{
 			m_Def.m_bOneChoiceForAllPlayers = (bool)PREFSMAN->m_bLockCourseDifficulties;
+			m_Def.m_layoutType = StringToLayoutType( STEPS_ROW_LAYOUT_TYPE );
 
 			vector<Trail*> vTrails;
 			GAMESTATE->m_pCurCourse->GetTrails( vTrails, GAMESTATE->GetCurrentStyle()->m_StepsType );
@@ -440,6 +442,8 @@ class OptionRowHandlerListSteps : public OptionRowHandlerList
 		}
 		else if( GAMESTATE->m_pCurSong ) // playing a song
 		{
+			m_Def.m_layoutType = StringToLayoutType( STEPS_ROW_LAYOUT_TYPE );
+
 			vector<Steps*> vpSteps;
 			Song *pSong = GAMESTATE->m_pCurSong;
 			SongUtil::GetSteps( pSong, vpSteps, GAMESTATE->GetCurrentStyle()->m_StepsType );