diff --git a/extensions/youtube/src/main/java/app/morphe/extension/youtube/patches/LayoutReloadObserverPatch.java b/extensions/youtube/src/main/java/app/morphe/extension/youtube/patches/LayoutReloadObserverPatch.java
index a8d57d680..8780b507f 100644
--- a/extensions/youtube/src/main/java/app/morphe/extension/youtube/patches/LayoutReloadObserverPatch.java
+++ b/extensions/youtube/src/main/java/app/morphe/extension/youtube/patches/LayoutReloadObserverPatch.java
@@ -51,7 +51,7 @@ public static void onLazilyConvertedElementLoaded(@NonNull String identifier,
         PlayerType playerType = PlayerType.getCurrent();
         if (playerType == PlayerType.WATCH_WHILE_MINIMIZED || playerType == PlayerType.WATCH_WHILE_PICTURE_IN_PICTURE) {
             if (isActionBarVisible.compareAndSet(false, true)) {
-                Utils.runOnMainThreadDelayed(() -> isActionBarVisible.compareAndSet(true, false), 250);
+                Utils.runOnMainThreadDelayed(() -> isActionBarVisible.compareAndSet(true, false), 100);
             }
         }
     }
diff --git a/extensions/youtube/src/main/java/app/morphe/extension/youtube/patches/components/HorizontalShelvesFilter.java b/extensions/youtube/src/main/java/app/morphe/extension/youtube/patches/components/HorizontalShelvesFilter.java
index 760a98ca5..102982ca7 100644
--- a/extensions/youtube/src/main/java/app/morphe/extension/youtube/patches/components/HorizontalShelvesFilter.java
+++ b/extensions/youtube/src/main/java/app/morphe/extension/youtube/patches/components/HorizontalShelvesFilter.java
@@ -69,13 +69,18 @@ public HorizontalShelvesFilter() {
         );
     }
 
+    private boolean isPlayerOrDescription() {
+        return EngagementPanel.isDescription()
+                || PlayerType.getCurrent().isMaximizedOrFullscreen()
+                || isActionBarVisible.get()
+                || ShortsPlayerState.isOpen();
+    }
+
     private boolean hideShelves(ContextInterface contextInterface) {
-        if (!Settings.HIDE_HORIZONTAL_SHELVES.get()) {
+        if (!Settings.HIDE_HORIZONTAL_SHELVES.get() || isPlayerOrDescription()) {
             return false;
         }
         return contextInterface.isHomeFeedOrRelatedVideo()
-                || PlayerType.getCurrent().isMaximizedOrFullscreen()
-                || isActionBarVisible.get()
                 || NavigationBar.isSearchBarActive()
                 || NavigationBar.isBackButtonVisible()
                 || NavigationButton.getSelectedNavigationButton() != NavigationButton.LIBRARY;
@@ -97,7 +102,7 @@ boolean isFiltered(ContextInterface contextInterface,
             return true;
         }
         if (descriptionBuffers.check(buffer).isFiltered()) {
-            return EngagementPanel.isDescription() || PlayerType.getCurrent().isMaximizedOrFullscreen() || isActionBarVisible.get() || ShortsPlayerState.isOpen();
+            return isPlayerOrDescription();
         }
         return hideShelves(contextInterface);
     }