diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 3fa065572a..9e8ed57f4a 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -16,7 +16,7 @@ EditMode=2
 MaxCourseEntriesBeforeShowVarious=6
 
 [Gameplay]
-ComboIsPerRow=false
+ComboIsPerRow=GAMESTATE:GetPlayMode() == PLAY_MODE_ONI
 MinScoreToContinueCombo=%function() if GAMESTATE:GetPlayMode() == PLAY_MODE_ONI then return TNS_PERFECT else return TNS_GREAT end end
 MinScoreToMaintainCombo=TNS_GREAT