diff --git a/stepmania/src/OptionRow.cpp b/stepmania/src/OptionRow.cpp
index b3dc86a965..4509cab167 100644
--- a/stepmania/src/OptionRow.cpp
+++ b/stepmania/src/OptionRow.cpp
@@ -332,8 +332,9 @@ void OptionRow::InitText()
 		float fTotalWidth = m_pParentType->ITEMS_END_X - m_pParentType->ITEMS_START_X;
 		if( fWidth > fTotalWidth ) 
 		{
-			if( fTotalWidth / fWidth >= m_pParentType->ITEMS_MIN_BASE_ZOOM )
-				fBaseZoom = fTotalWidth / fWidth;
+			float fPossibleBaseZoom = fTotalWidth / fWidth;
+			if( fPossibleBaseZoom >= m_pParentType->ITEMS_MIN_BASE_ZOOM )
+				fBaseZoom = fPossibleBaseZoom;
 			else
 				m_pHand->m_Def.m_layoutType = LAYOUT_SHOW_ONE_IN_ROW;
 		}