diff --git a/demo/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java b/demo/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
index e61a9ed130..9add658d30 100644
--- a/demo/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
+++ b/demo/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
@@ -461,11 +461,12 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay
     playerNeedsSource = true;
     if (isBehindLiveWindow(e)) {
       clearResumePosition();
+      initializePlayer();
     } else {
       updateResumePosition();
+      updateButtonVisibilities();
+      showControls();
     }
-    updateButtonVisibilities();
-    showControls();
   }
 
   @Override