diff --git a/Playlist/PlaylistController.m b/Playlist/PlaylistController.m
index 1c070135f..42360cfb6 100644
--- a/Playlist/PlaylistController.m
+++ b/Playlist/PlaylistController.m
@@ -61,6 +61,17 @@
 }
 
 
+- (void)initDefaults
+{
+	NSDictionary *defaultsDictionary = [NSDictionary dictionaryWithObjectsAndKeys:
+										[NSNumber numberWithInteger:RepeatNone], @"repeatMode",
+										[NSNumber numberWithBool:NO],  @"shuffle",
+										nil];
+	
+	[[NSUserDefaults standardUserDefaults] registerDefaults:defaultsDictionary];
+}
+
+
 - (id)initWithCoder:(NSCoder *)decoder
 {
 	self = [super initWithCoder:decoder];
@@ -69,11 +80,13 @@
 	{
 		shuffleList = [[NSMutableArray alloc] init];
 		queueList = [[NSMutableArray alloc] init];
+		[self initDefaults];
 	}
 	
 	return self;
 }
 
+
 - (void)dealloc
 {
 	[shuffleList release];