diff --git a/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java b/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java
index 5def611d..7bf6c2d9 100644
--- a/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java
+++ b/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java
@@ -696,8 +696,14 @@ public class FullPlaybackActivity extends SlidingPlaybackActivity
 	@Override
 	public void onSlideFullyExpanded(boolean expanded) {
 		super.onSlideFullyExpanded(expanded);
-		if (expanded)
+
+		setControlsVisible(true);
+		if (expanded) {
 			setExtraInfoVisible(false);
+		} else {
+			SharedPreferences settings = PlaybackService.getSettings(this);
+			setExtraInfoVisible(settings.getBoolean(PrefKeys.VISIBLE_EXTRA_INFO, PrefDefaults.VISIBLE_EXTRA_INFO));
+		}
 	}
 
 }