diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index d8cfe2cf4..c721cfcb1 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -11,49 +11,10 @@
       "type": "UNIVERSAL",
       "filters": [],
       "attributes": [],
-      "versionCode": 18,
-      "versionName": "0.5.1",
+      "versionCode": 19,
+      "versionName": "0.6.0",
       "outputFile": "app-universal-release.apk"
     },
-    {
-      "type": "ONE_OF_MANY",
-      "filters": [
-        {
-          "filterType": "ABI",
-          "value": "armeabi-v7a"
-        }
-      ],
-      "attributes": [],
-      "versionCode": 18,
-      "versionName": "0.5.1",
-      "outputFile": "app-armeabi-v7a-release.apk"
-    },
-    {
-      "type": "ONE_OF_MANY",
-      "filters": [
-        {
-          "filterType": "ABI",
-          "value": "arm64-v8a"
-        }
-      ],
-      "attributes": [],
-      "versionCode": 18,
-      "versionName": "0.5.1",
-      "outputFile": "app-arm64-v8a-release.apk"
-    },
-    {
-      "type": "ONE_OF_MANY",
-      "filters": [
-        {
-          "filterType": "ABI",
-          "value": "x86_64"
-        }
-      ],
-      "attributes": [],
-      "versionCode": 18,
-      "versionName": "0.5.1",
-      "outputFile": "app-x86_64-release.apk"
-    },
     {
       "type": "ONE_OF_MANY",
       "filters": [
@@ -63,9 +24,48 @@
         }
       ],
       "attributes": [],
-      "versionCode": 18,
-      "versionName": "0.5.1",
+      "versionCode": 19,
+      "versionName": "0.6.0",
       "outputFile": "app-x86-release.apk"
+    },
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "x86_64"
+        }
+      ],
+      "attributes": [],
+      "versionCode": 19,
+      "versionName": "0.6.0",
+      "outputFile": "app-x86_64-release.apk"
+    },
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "arm64-v8a"
+        }
+      ],
+      "attributes": [],
+      "versionCode": 19,
+      "versionName": "0.6.0",
+      "outputFile": "app-arm64-v8a-release.apk"
+    },
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "armeabi-v7a"
+        }
+      ],
+      "attributes": [],
+      "versionCode": 19,
+      "versionName": "0.6.0",
+      "outputFile": "app-armeabi-v7a-release.apk"
     }
   ],
   "elementType": "File"
diff --git a/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt
index 84316eef2..19da429fb 100644
--- a/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt
+++ b/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt
@@ -7,6 +7,7 @@ import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
+import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
@@ -262,7 +263,11 @@ class MainActivity : BaseActivity() {
 
             override fun onQueryTextChange(newText: String?): Boolean {
                 // prevent malicious navigation when the search view is getting collapsed
-                if (navController.currentDestination?.id == R.id.searchResultFragment &&
+                if (navController.currentDestination?.id in listOf(
+                        R.id.searchResultFragment,
+                        R.id.channelFragment,
+                        R.id.playlistFragment
+                    ) &&
                     (newText == null || newText == "")
                 ) {
                     return false