diff --git a/XamlStudio/Models/FileBackedDocument.cs b/XamlStudio/Models/FileBackedDocument.cs
index e2ffc8e..f88d9d7 100644
--- a/XamlStudio/Models/FileBackedDocument.cs
+++ b/XamlStudio/Models/FileBackedDocument.cs
@@ -25,10 +25,16 @@ public abstract partial class FileBackedDocument : ObservableObject
     /// </summary>
     public string Title
     {
-        get { return (HasChanged ? "*" : "") + field; }
-        set { SetProperty(ref field, value.Trim('*')); }
+        get => (HasChanged ? "*" : "") + field;
+        set => SetProperty(ref field, value.Trim('*'));
     }
 
+    /// <summary>
+    /// Gets the file path as displayed for tooltips
+    /// </summary>
+    [JsonIgnore]
+    public string DisplayPath => BackingFile?.Path ?? Title;
+
     //// TODO: This is effectively private, but needs to be serialized, investigate options when switching away from Newtonsoft
     public string StorageToken { get; set; }
 
diff --git a/XamlStudio/Models/XamlDocument.cs b/XamlStudio/Models/XamlDocument.cs
index c3322f5..066bd6f 100644
--- a/XamlStudio/Models/XamlDocument.cs
+++ b/XamlStudio/Models/XamlDocument.cs
@@ -38,7 +38,7 @@ public sealed partial class XamlDocument : FileBackedDocument
     public partial DocumentState State { get; set; } = new DocumentState();
 
     [JsonIgnore]
-    public string DisplayName { get { return BackingFile.DisplayName; } }
+    public string DisplayName => BackingFile?.DisplayName;
 
     internal XamlDocument()
     {
diff --git a/XamlStudio/Views/Explorer.xaml b/XamlStudio/Views/Explorer.xaml
index b21b6c6..95b813e 100644
--- a/XamlStudio/Views/Explorer.xaml
+++ b/XamlStudio/Views/Explorer.xaml
@@ -31,7 +31,8 @@
                 <TextBlock HorizontalAlignment="Left"
                            VerticalAlignment="Center"
                            Style="{ThemeResource BodyTextBlockStyle}"
-                           Text="{x:Bind ((storage:StorageFile)Content).Name}" />
+                           Text="{x:Bind ((storage:StorageFile)Content).Name}"
+                           ToolTipService.ToolTip="{x:Bind ((storage:StorageFile)Content).Name}" />
             </StackPanel>
         </DataTemplate>
 
@@ -43,7 +44,8 @@
                 <TextBlock HorizontalAlignment="Left"
                            VerticalAlignment="Center"
                            Style="{ThemeResource BodyTextBlockStyle}"
-                           Text="{x:Bind ((storage:StorageFile)Content).Name}" />
+                           Text="{x:Bind ((storage:StorageFile)Content).Name}"
+                           ToolTipService.ToolTip="{x:Bind ((storage:StorageFile)Content).Name}" />
             </StackPanel>
         </DataTemplate>
 
@@ -55,7 +57,8 @@
                 <TextBlock HorizontalAlignment="Left"
                            VerticalAlignment="Center"
                            Style="{ThemeResource BodyTextBlockStyle}"
-                           Text="{x:Bind ((storage:StorageFile)Content).Name}" />
+                           Text="{x:Bind ((storage:StorageFile)Content).Name}"
+                           ToolTipService.ToolTip="{x:Bind ((storage:StorageFile)Content).Name}" />
                 <!--  Show Hover Preview of Image  -->
                 <ToolTipService.ToolTip>
                     <Image Width="128"
@@ -74,7 +77,8 @@
                 <TextBlock HorizontalAlignment="Left"
                            VerticalAlignment="Center"
                            Style="{ThemeResource BodyTextBlockStyle}"
-                           Text="{x:Bind ((storage:StorageFile)Content).Name}" />
+                           Text="{x:Bind ((storage:StorageFile)Content).Name}"
+                           ToolTipService.ToolTip="{x:Bind ((storage:StorageFile)Content).Name}" />
             </StackPanel>
         </DataTemplate>
 
@@ -84,7 +88,8 @@
                 <TextBlock HorizontalAlignment="Left"
                            VerticalAlignment="Center"
                            Style="{ThemeResource BodyTextBlockStyle}"
-                           Text="{x:Bind ((storage:StorageFolder)Content).DisplayName}" />
+                           Text="{x:Bind ((storage:StorageFolder)Content).DisplayName}"
+                           ToolTipService.ToolTip="{x:Bind ((storage:StorageFolder)Content).DisplayName}" />
             </StackPanel>
         </DataTemplate>
 
@@ -149,7 +154,9 @@
                             <TextBlock Margin="32,0"
                                        VerticalAlignment="Center"
                                        FontWeight="SemiBold"
-                                       Text="{Binding Title}" />
+                                       Text="{Binding Title}"
+                                       TextTrimming="CharacterEllipsis"
+                                       ToolTipService.ToolTip="{Binding DisplayPath}"/>
                             <StackPanel Grid.Column="1"
                                         ex:FrameworkElementExtensions.AncestorType="ListViewItem"
                                         Orientation="Horizontal"
diff --git a/XamlStudio/Views/MainPage.xaml b/XamlStudio/Views/MainPage.xaml
index e6cfd11..6b12dc1 100644
--- a/XamlStudio/Views/MainPage.xaml
+++ b/XamlStudio/Views/MainPage.xaml
@@ -241,14 +241,14 @@
                         </muxc:TabView.Resources>
                         <muxc:TabView.TabItemTemplate>
                             <DataTemplate x:DataType="models:XamlDocument">
-                                <muxc:TabViewItem HorizontalContentAlignment="Stretch" ContextFlyout="{StaticResource TabItemFlyout}">
+                                <muxc:TabViewItem ToolTipService.ToolTip="{x:Bind DisplayPath, Mode=OneWay}" HorizontalContentAlignment="Stretch" ContextFlyout="{StaticResource TabItemFlyout}">
                                     <muxc:TabViewItem.Header>
                                         <Grid>
                                             <Grid.ColumnDefinitions>
                                                 <ColumnDefinition Width="*" />
                                                 <ColumnDefinition Width="Auto" />
                                             </Grid.ColumnDefinitions>
-                                            <TextBlock Text="{x:Bind Title, Mode=OneWay}" />
+                                            <TextBlock Text="{x:Bind Title, Mode=OneWay}" TextTrimming="CharacterEllipsis"/>
                                             <controls:SwitchPresenter Grid.Column="1"
                                                                       TargetType="models:SyncStatus"
                                                                       Value="{x:Bind State.RenderState, Mode=OneWay}">