diff --git a/src/Files.App/Converters/MultiBooleanConverter.cs b/src/Files.App/Converters/MultiBooleanConverter.cs
index ea02e07e517e..56d24749f54c 100644
--- a/src/Files.App/Converters/MultiBooleanConverter.cs
+++ b/src/Files.App/Converters/MultiBooleanConverter.cs
@@ -22,6 +22,9 @@ public static Boolean OrAndConvert(bool a, bool b, bool c)
 		public static Visibility OrConvertToVisibility(bool a, bool b)
 			=> (a || b) ? Visibility.Visible : Visibility.Collapsed;
 
+		public static Visibility AndConvertToVisibility(bool a, bool b)
+			=> (a && b) ? Visibility.Visible : Visibility.Collapsed;
+
 		public static Visibility NorConvertToVisibility(bool a, bool b)
 			=> !(a || b) ? Visibility.Visible : Visibility.Collapsed;
 
diff --git a/src/Files.App/UserControls/InnerNavigationToolbar.xaml b/src/Files.App/UserControls/InnerNavigationToolbar.xaml
index 4e3517e2a574..0d903392c887 100644
--- a/src/Files.App/UserControls/InnerNavigationToolbar.xaml
+++ b/src/Files.App/UserControls/InnerNavigationToolbar.xaml
@@ -66,17 +66,6 @@
 			<ColumnDefinition Width="Auto" />
 		</Grid.ColumnDefinitions>
 
-		<!--  Home page header  -->
-		<TextBlock
-			x:Name="HomePageHeaderTextBlock"
-			Grid.Column="0"
-			Margin="18,0,0,0"
-			HorizontalAlignment="Left"
-			VerticalAlignment="Center"
-			x:Load="{x:Bind ViewModel.InstanceViewModel.IsPageTypeNotHome, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
-			Style="{StaticResource App.Theme.SubtitleTextBlockStyle}"
-			Text="{helpers:ResourceString Name=Home}" />
-
 		<!--  Context Commands  -->
 		<CommandBar
 			x:Name="ContextCommandBar"
diff --git a/src/Files.App/Views/MainPage.xaml b/src/Files.App/Views/MainPage.xaml
index ca4f6ba8ccb1..b424d2894965 100644
--- a/src/Files.App/Views/MainPage.xaml
+++ b/src/Files.App/Views/MainPage.xaml
@@ -3,6 +3,7 @@
 	x:Class="Files.App.Views.MainPage"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:converters="using:Files.App.Converters"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:helpers="using:Files.App.Helpers"
 	xmlns:i="using:Microsoft.Xaml.Interactivity"
@@ -205,7 +206,7 @@
 						ShowPreviewPaneButton="{x:Bind ViewModel.ShouldPreviewPaneBeDisplayed, Mode=OneWay}"
 						ShowViewControlButton="{x:Bind ViewModel.ShouldViewControlBeDisplayed, Mode=OneWay}"
 						TabIndex="2"
-						Visibility="{x:Bind ViewModel.ShowToolbar, Mode=OneWay}" />
+						Visibility="{x:Bind converters:MultiBooleanConverter.AndConvertToVisibility(SidebarAdaptiveViewModel.PaneHolder.ActivePaneOrColumn.InstanceViewModel.IsPageTypeNotHome, ViewModel.ShowToolbar), Mode=OneWay}" />
 
 					<!--  Page Content  -->
 					<ContentPresenter