diff --git a/apps/media/js/player.js b/apps/media/js/player.js
index b3eb527870552d458cf6e90ee4de57149dd32619..3c022e9f8c48ebf69a57ceaf37d54c0645fca1bd 100644
--- a/apps/media/js/player.js
+++ b/apps/media/js/player.js
@@ -170,9 +170,7 @@ var PlayList={
 					localStorage.setItem(oc_current_user+'oc_playlist_volume',volume);
 				}
 			}
-			if(PlayList.active){
-				localStorage.setItem(oc_current_user+'oc_playlist_active','false');
-			}
+			localStorage.setItem(oc_current_user+'oc_playlist_active','true');
 		}
 	},
 	load:function(){
@@ -209,6 +207,9 @@ var PlayList={
 $(document).ready(function(){
 	$(window).bind('beforeunload', function (){
 		PlayList.save();
+		if(PlayList.active){
+			localStorage.setItem(oc_current_user+'oc_playlist_active','false');
+		}
 	});
 
 	$('jp-previous').tipsy({gravity:'n', fade:true, live:true});