diff --git a/src/ch/blinkenlights/android/vanilla/PlaybackActivity.java b/src/ch/blinkenlights/android/vanilla/PlaybackActivity.java
index adbdb3df..6467edfb 100644
--- a/src/ch/blinkenlights/android/vanilla/PlaybackActivity.java
+++ b/src/ch/blinkenlights/android/vanilla/PlaybackActivity.java
@@ -121,9 +121,11 @@ public abstract class PlaybackActivity extends Activity
 
 		Window window = getWindow();
 		if (prefs.getBoolean(PrefKeys.DISABLE_LOCKSCREEN, false))
-			window.addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
+			window.addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD
+					| WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
 		else
-			window.clearFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
+			window.clearFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD
+					| WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
 	}
 
 	@Override