diff --git a/libsaria/controls.py b/libsaria/controls.py
index e476e4b6..87bd87dd 100644
--- a/libsaria/controls.py
+++ b/libsaria/controls.py
@@ -53,11 +53,11 @@ def pick_next():
 	if file == None:
 		file = playlist.next()
 	load(file)
-	if pause_after == False:
-		play()
-	else:
+	if pause_after == True:
 		pause()
-		pause_after = False
+	else:
+		play()
+	pause_after = False
 
 def catch_eos(*args):
 	library.inc_count()