diff --git a/Files/UserControls/NavigationToolbar/ModernNavigationToolbar.xaml b/Files/UserControls/NavigationToolbar/ModernNavigationToolbar.xaml
index 928a13c28118..8a976020ecb8 100644
--- a/Files/UserControls/NavigationToolbar/ModernNavigationToolbar.xaml
+++ b/Files/UserControls/NavigationToolbar/ModernNavigationToolbar.xaml
@@ -532,6 +532,7 @@
                 Width="34"
                 Height="30"
                 Margin="4,0,2,0"
+                ToolTipService.ToolTip="Back"
                 x:FieldModifier="public"
                 Background="Transparent"
                 Click="{x:Bind local1:NavigationActions.Back_Click}"
@@ -553,6 +554,7 @@
                 Width="34"
                 Height="30"
                 Margin="2,0,2,0"
+                ToolTipService.ToolTip="Forward"
                 x:FieldModifier="public"
                 Background="Transparent"
                 Click="{x:Bind local1:NavigationActions.Forward_Click}"
@@ -573,6 +575,7 @@
                 Width="34"
                 Height="30"
                 Margin="2,0,2,0"
+                ToolTipService.ToolTip="Up"
                 x:FieldModifier="public"
                 Background="Transparent"
                 Click="{x:Bind local1:NavigationActions.Up_Click}"
@@ -593,6 +596,7 @@
                 Width="34"
                 Height="30"
                 Margin="2,0,0,0"
+                ToolTipService.ToolTip="Refresh"
                 x:FieldModifier="public"
                 Background="Transparent"
                 Click="{x:Bind local1:NavigationActions.Refresh_Click}"
@@ -685,6 +689,7 @@
                 Grid.Row="3"
                 Margin="0,0,4,0"
                 HorizontalAlignment="Right"
+                ToolTipService.ToolTip="Create a new item"
                 x:Load="{x:Bind local1:App.InteractionViewModel.IsPageTypeNotHome, Mode=OneWay}"
                 Background="Transparent"
                 FontFamily="Segoe MDL2 Assets"
@@ -727,6 +732,7 @@
                 x:Name="SearchButton"
                 Grid.Row="3"
                 Margin="0,0,4,0"
+                ToolTipService.ToolTip="Search"
                 HorizontalAlignment="Right"
                 Background="Transparent"
                 FontFamily="Segoe MDL2 Assets"
@@ -753,6 +759,7 @@
             <Button
                 Grid.Row="3"
                 Margin="0,0,4,0"
+                ToolTipService.ToolTip="More options"
                 HorizontalAlignment="Right"
                 Background="Transparent"
                 Content=""