diff --git a/stepmania/src/ScreenOptionsMaster.cpp b/stepmania/src/ScreenOptionsMaster.cpp
index 5fb3184d22..f869b2d7e2 100644
--- a/stepmania/src/ScreenOptionsMaster.cpp
+++ b/stepmania/src/ScreenOptionsMaster.cpp
@@ -707,24 +707,12 @@ void ScreenOptionsMaster::RefreshIcons()
 			const OptionRowDefinition &data = row.m_RowDef;
 
 			// find first selection and whether multiple are selected
-			int iFirstSelection = -1;
-			bool bMultipleSelected = false;
-			for( unsigned j=0; j<row.m_vbSelected[p].size(); j++ )
-			{
-				if( row.m_vbSelected[p][j] )
-				{
-					if( iFirstSelection != -1 )
-						bMultipleSelected = true;
-					else
-						iFirstSelection = j;
-				}
-
-			}
+			int iFirstSelection = row.GetOneSelection( p, true );
 
 			// set icon name
 			CString sIcon;
 
-			if( bMultipleSelected )
+			if( iFirstSelection == -1 )
 			{
 				sIcon = "Multi";
 			}