diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index be4d504..c726e2e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -88,7 +88,7 @@
             android:name=".VideoPlayer"
             android:resizeableActivity="true"
             android:supportsPictureInPicture="true"
-            android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|uiMode|keyboardHidden"
+            android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout|uiMode|keyboardHidden"
             android:exported="false"
             android:theme="@style/Theme.AsgardiusS3Manager.NoActionBar" />
         <activity
diff --git a/app/src/main/java/asgardius/page/s3manager/VideoPlayer.java b/app/src/main/java/asgardius/page/s3manager/VideoPlayer.java
index 84fe941..fed010d 100644
--- a/app/src/main/java/asgardius/page/s3manager/VideoPlayer.java
+++ b/app/src/main/java/asgardius/page/s3manager/VideoPlayer.java
@@ -20,8 +20,6 @@ import com.google.android.exoplayer2.MediaItem;
 import com.google.android.exoplayer2.PlaybackException;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.database.StandaloneDatabaseProvider;
-import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory;
-import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.source.ProgressiveMediaSource;
 import com.google.android.exoplayer2.ui.StyledPlayerView;
 import com.google.android.exoplayer2.upstream.DefaultHttpDataSource;
@@ -204,7 +202,18 @@ public class VideoPlayer extends AppCompatActivity {
         playerView.setPlayer(null);
         player.release();
         super.onDestroy();
+    }
 
+    public void onStop() {
+        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N
+                && this.getPackageManager()
+                .hasSystemFeature(
+                        PackageManager.FEATURE_PICTURE_IN_PICTURE)) {
+            simpleCache.release();
+            playerView.setPlayer(null);
+            player.release();
+        }
+        super.onStop();
     }
 
     public void onUserLeaveHint() {
@@ -212,8 +221,14 @@ public class VideoPlayer extends AppCompatActivity {
         enterPIPMode();
     }
 
-    /*public void onBackPressed() {
-        player.release();
-        finish();
-    }*/
+    public void onBackPressed() {
+        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N
+                && this.getPackageManager()
+                .hasSystemFeature(
+                        PackageManager.FEATURE_PICTURE_IN_PICTURE)) {
+            enterPIPMode();
+        } else {
+            super.onBackPressed();
+        }
+    }
 }
\ No newline at end of file