diff --git a/Base.lproj/MainMenu.xib b/Base.lproj/MainMenu.xib
index a3df60c01..7e795893f 100644
--- a/Base.lproj/MainMenu.xib
+++ b/Base.lproj/MainMenu.xib
@@ -1919,17 +1919,11 @@ CA
                             <menuItem title="Repeat" id="1740">
                                 <menu key="submenu" title="Repeat" id="1741">
                                     <items>
-                                        <menuItem title="All" keyEquivalent="r" id="1742">
+                                        <menuItem title="All" state="on" keyEquivalent="r" id="1742">
                                             <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
                                             <connections>
                                                 <binding destination="218" name="value" keyPath="repeat" id="1760">
                                                     <dictionary key="options">
-                                                        <integer key="NSAllowsEditingMultipleValuesSelection" value="0"/>
-                                                        <integer key="NSAlwaysPresentsApplicationModalAlerts" value="0"/>
-                                                        <integer key="NSConditionallySetsEnabled" value="0"/>
-                                                        <integer key="NSConditionallySetsHidden" value="0"/>
-                                                        <integer key="NSRaisesForNotApplicableKeys" value="1"/>
-                                                        <integer key="NSValidatesImmediately" value="0"/>
                                                         <string key="NSValueTransformerName">RepeatAllTransformer</string>
                                                     </dictionary>
                                                 </binding>
@@ -1939,8 +1933,6 @@ CA
                                             <connections>
                                                 <binding destination="218" name="value" keyPath="repeat" id="2412">
                                                     <dictionary key="options">
-                                                        <bool key="NSAllowsEditingMultipleValuesSelection" value="NO"/>
-                                                        <bool key="NSConditionallySetsEnabled" value="NO"/>
                                                         <string key="NSValueTransformerName">RepeatAlbumTransformer</string>
                                                     </dictionary>
                                                 </binding>
@@ -1950,12 +1942,6 @@ CA
                                             <connections>
                                                 <binding destination="218" name="value" keyPath="repeat" id="1763">
                                                     <dictionary key="options">
-                                                        <integer key="NSAllowsEditingMultipleValuesSelection" value="0"/>
-                                                        <integer key="NSAlwaysPresentsApplicationModalAlerts" value="0"/>
-                                                        <integer key="NSConditionallySetsEnabled" value="0"/>
-                                                        <integer key="NSConditionallySetsHidden" value="0"/>
-                                                        <integer key="NSRaisesForNotApplicableKeys" value="1"/>
-                                                        <integer key="NSValidatesImmediately" value="0"/>
                                                         <string key="NSValueTransformerName">RepeatOneTransformer</string>
                                                     </dictionary>
                                                 </binding>
@@ -1965,12 +1951,6 @@ CA
                                             <connections>
                                                 <binding destination="218" name="value" keyPath="repeat" id="1767">
                                                     <dictionary key="options">
-                                                        <integer key="NSAllowsEditingMultipleValuesSelection" value="0"/>
-                                                        <integer key="NSAlwaysPresentsApplicationModalAlerts" value="0"/>
-                                                        <integer key="NSConditionallySetsEnabled" value="0"/>
-                                                        <integer key="NSConditionallySetsHidden" value="0"/>
-                                                        <integer key="NSRaisesForNotApplicableKeys" value="1"/>
-                                                        <integer key="NSValidatesImmediately" value="0"/>
                                                         <string key="NSValueTransformerName">RepeatNoneTransformer</string>
                                                     </dictionary>
                                                 </binding>
diff --git a/Playlist/PlaylistController.m b/Playlist/PlaylistController.m
index 9306f0419..64f2df006 100644
--- a/Playlist/PlaylistController.m
+++ b/Playlist/PlaylistController.m
@@ -98,7 +98,7 @@ static void *playlistControllerContext = &playlistControllerContext;
 }
 
 - (void)initDefaults {
-	NSDictionary *defaultsDictionary = @{ @"repeat": @(RepeatModeNoRepeat), @"shuffle": @(ShuffleOff) };
+	NSDictionary *defaultsDictionary = @{ @"repeat": @(RepeatModeRepeatAll), @"shuffle": @(ShuffleOff) };
 
 	[[NSUserDefaults standardUserDefaults] registerDefaults:defaultsDictionary];
 }