diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 86887d5..baeaede 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -27,6 +27,8 @@
             android:name=".activity.LoginActivity"
             android:label="@string/title_activity_login" />
         <activity
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
+            android:launchMode="singleTop"
             android:name=".activity.VideoPlayActivity"
             android:label="@string/title_activity_video_play"
             android:theme="@style/AppTheme" />
diff --git a/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java b/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java
index b559ac6..8881c63 100644
--- a/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java
+++ b/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java
@@ -61,7 +61,7 @@ public class VideoPlayActivity extends AppCompatActivity implements VideoRendere
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_torrent_video_play);
+        setContentView(R.layout.activity_video_play);
 
         // get video ID
         Intent intent = getIntent();
diff --git a/app/src/main/res/layout/activity_torrent_video_play.xml b/app/src/main/res/layout/activity_video_play.xml
similarity index 95%
rename from app/src/main/res/layout/activity_torrent_video_play.xml
rename to app/src/main/res/layout/activity_video_play.xml
index 93d5376..491dd50 100644
--- a/app/src/main/res/layout/activity_torrent_video_play.xml
+++ b/app/src/main/res/layout/activity_video_play.xml
@@ -21,11 +21,7 @@
             app:layout_constraintDimensionRatio="H,3:1"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-
-            >
-
-        </com.google.android.exoplayer2.ui.PlayerView>
+            app:layout_constraintTop_toTopOf="parent" />
 
         <ProgressBar
             android:id="@+id/progress"