diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt
index 60dc7fe89..b647400e3 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt
@@ -109,8 +109,7 @@ class MainActivity : AbsCastActivity(), OnSharedPreferenceChangeListener {
                     setBottomNavVisibility(visible = true, animate = true)
                 }
                 R.id.playing_queue_fragment -> {
-                    setBottomNavVisibility(visible = false)
-                    hideBottomSheet(true)
+                    setBottomNavVisibility(visible = false, hideBottomSheet = true)
                 }
                 else -> setBottomNavVisibility(
                     visible = false,
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
index 8034362b5..118fab103 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
@@ -92,7 +92,6 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
             when (newState) {
                 STATE_EXPANDED -> {
                     onPanelExpanded()
-
                 }
                 STATE_COLLAPSED -> {
                     onPanelCollapsed()
@@ -316,10 +315,11 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
         })
     }
 
-    fun setBottomNavVisibility(visible: Boolean, animate: Boolean = false) {
+    fun setBottomNavVisibility(visible: Boolean, animate: Boolean = false, hideBottomSheet: Boolean = MusicPlayerRemote.playingQueue.isEmpty()) {
         val translationY =
             if (visible) 0F else dip(R.dimen.bottom_nav_height).toFloat() + windowInsets.safeGetBottomInsets()
-        if (animate) {
+        val mAnimate = animate && bottomSheetBehavior.state == STATE_COLLAPSED
+        if (mAnimate) {
             binding.bottomNavigationView.translateYAnimate(translationY).doOnEnd {
                 if (visible && bottomSheetBehavior.state != STATE_EXPANDED) {
                     binding.bottomNavigationView.bringToFront()
@@ -328,12 +328,13 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
         } else {
             binding.bottomNavigationView.translationY =
                 translationY
+            binding.bottomNavigationView.isVisible = false
             if (visible && bottomSheetBehavior.state != STATE_EXPANDED) {
                 binding.bottomNavigationView.bringToFront()
             }
         }
         hideBottomSheet(
-            hide = MusicPlayerRemote.playingQueue.isEmpty(),
+            hide = hideBottomSheet,
             animate = animate,
             isBottomNavVisible = visible
         )