diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/managers/VideoLoader.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/managers/VideoLoader.java
index 5d3757c2c3..d78086ce4b 100644
--- a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/managers/VideoLoader.java
+++ b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/managers/VideoLoader.java
@@ -119,7 +119,9 @@ public void onPlayEnd() {
             switch (mRepeatMode) {
                 case PlaybackUiController.REPEAT_ALL:
                     onNextClicked();
-                    mController.showControls(true);
+                    if (!mController.isInPIPMode()) {
+                        mController.showControls(true);
+                    }
                     break;
                 case PlaybackUiController.REPEAT_ONE:
                     loadVideo(mLastVideo);
diff --git a/smarttubetv/build.gradle b/smarttubetv/build.gradle
index c776bee5ab..b15ffdf6a7 100644
--- a/smarttubetv/build.gradle
+++ b/smarttubetv/build.gradle
@@ -48,8 +48,8 @@ android {
         applicationId "com.liskovsoft.smarttubetv"
         minSdkVersion project.properties.minSdkVersion
         targetSdkVersion project.properties.targetSdkVersion
-        versionCode 156
-        versionName "10.16"
+        versionCode 157
+        versionName "10.17"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField "long", "TIMESTAMP", System.currentTimeMillis() + "L"