diff --git a/src/Views/Blame.axaml b/src/Views/Blame.axaml
index fd28a3a54..f2c807492 100644
--- a/src/Views/Blame.axaml
+++ b/src/Views/Blame.axaml
@@ -116,10 +116,10 @@
                      FontWeight="Bold"
                      Margin="0,0,6,0"
                      FontFamily="{DynamicResource Fonts.Monospace}"
-                     Text="{Binding Revision.SHA, Converter={x:Static c:StringConverters.ToShortSHA}, Mode=OneWay}"/>
+                     Text="{Binding Revision.SHA, Converter={x:Static c:StringConverters.ToShortSHA}, Mode=OneWay, FallbackValue={x:Null}}"/>
 
           <TextBlock Grid.Column="1"
-                     Text="{Binding Revision.Subject}"
+                     Text="{Binding Revision.Subject, FallbackValue={x:Null}}"
                      TextTrimming="CharacterEllipsis"/>
         </Grid>
       </Border>
diff --git a/src/Views/RevisionFileTreeView.axaml.cs b/src/Views/RevisionFileTreeView.axaml.cs
index bf9586765..953aeff54 100644
--- a/src/Views/RevisionFileTreeView.axaml.cs
+++ b/src/Views/RevisionFileTreeView.axaml.cs
@@ -312,7 +312,7 @@ public async Task SetSearchResultAsync(string file)
 
                         last.Add(folder);
                         last = folder.Children;
-                        prefix = folder.Backend + "/";
+                        prefix = folder.Backend.Path + "/";
                     }
 
                     last.Add(new ViewModels.RevisionFileTreeNode
diff --git a/src/Views/RevisionFiles.axaml b/src/Views/RevisionFiles.axaml
index 8f0407e30..edfd73359 100644
--- a/src/Views/RevisionFiles.axaml
+++ b/src/Views/RevisionFiles.axaml
@@ -109,7 +109,7 @@
 
       <!-- File Tree -->
       <Border Grid.Row="1" Margin="0,4,0,0" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}">
-        <v:RevisionFileTreeView x:Name="FileTree" Revision="{Binding Commit.SHA}" SearchRequested="OnToggleSearch"/>
+        <v:RevisionFileTreeView x:Name="FileTree" Revision="{Binding Commit.SHA, FallbackValue={x:Null}}" SearchRequested="OnToggleSearch"/>
       </Border>
     </Grid>