diff --git a/Sources/YTReExplore.x b/Sources/YTReExplore.x
index e7f329d37f..070f426640 100644
--- a/Sources/YTReExplore.x
+++ b/Sources/YTReExplore.x
@@ -1,4 +1,3 @@
-#import <YouTubeHeader/YTIPivotBarRenderer.h>
 #import <YouTubeHeader/YTIGuideResponse.h>
 #import <YouTubeHeader/YTIGuideResponseSupportedRenderers.h>
 #import <YouTubeHeader/YTIBrowseRequest.h>
diff --git a/Sources/uYouPlus.h b/Sources/uYouPlus.h
index bf5d832573..7bbe66b8cd 100644
--- a/Sources/uYouPlus.h
+++ b/Sources/uYouPlus.h
@@ -34,6 +34,7 @@
 #import <YouTubeHeader/GPBMessage.h>
 #import <YouTubeHeader/YTIStringRun.h>
 #import <YouTubeHeader/YTWatchViewController.h>
+#import <YouTubeHeader/YTIPivotBarRenderer.h>
 
 // Hide buttons under the video player by @PoomSmart
 #import <YouTubeHeader/ASCollectionElement.h>
diff --git a/Sources/uYouPlus.xm b/Sources/uYouPlus.xm
index ade4fc8159..b0102a90ef 100644
--- a/Sources/uYouPlus.xm
+++ b/Sources/uYouPlus.xm
@@ -1225,17 +1225,31 @@ static BOOL findCell(ASNodeController *nodeController, NSArray <NSString *> *ide
 
 // Hide Home Tab - @bhackel
 %group gHideHomeTab
-%hook YTPivotBarItemView
-- (void)layoutSubviews {
-    %orig;
-    // Check if this is the home tab button
-    YTPivotBarItemViewAccessibilityControl *hitTarget = self.hitTarget;
-    if (!self.hidden && [hitTarget.accessibilityIdentifier isEqualToString:@"id.ui.pivotbar.FEwhat_to_watch.button"]) {
-        // Hide the home tab button
-        self.hidden = YES;
-        self.frame = CGRectZero;
-        [self removeFromSuperview];
+%hook YTPivotBarView
+- (void)setRenderer:(YTIPivotBarRenderer *)renderer {
+    // Iterate over each renderer item
+    NSLog(@"bhackel: setting renderer");
+    NSUInteger indexToRemove = -1;
+    NSMutableArray <YTIPivotBarSupportedRenderers *> *itemsArray = renderer.itemsArray;
+    NSLog(@"bhackel: starting loop");
+    for (NSUInteger i = 0; i < itemsArray.count; i++) {
+        NSLog(@"bhackel: iterating index %lu", (unsigned long)i);
+        YTIPivotBarSupportedRenderers *item = itemsArray[i];
+        // Check if this is the home tab button
+        NSLog(@"bhackel: checking identifier");
+        YTIPivotBarItemRenderer *pivotBarItemRenderer = item.pivotBarItemRenderer;
+        NSString *pivotIdentifier = pivotBarItemRenderer.pivotIdentifier;
+        if ([pivotIdentifier isEqualToString:@"FEwhat_to_watch"]) {
+            NSLog(@"bhackel: removing home tab button");
+            // Remove the home tab button
+            indexToRemove = i;
+            break;
+        }
     }
+    if (indexToRemove != -1) {
+        [itemsArray removeObjectAtIndex:indexToRemove];
+    }
+    %orig;
 }
 %end
 %end