diff --git a/Aaru.Tui/ViewModels/Windows/ImageWindowViewModel.cs b/Aaru.Tui/ViewModels/Windows/ImageWindowViewModel.cs
index f29f30ea9..0126a0f36 100644
--- a/Aaru.Tui/ViewModels/Windows/ImageWindowViewModel.cs
+++ b/Aaru.Tui/ViewModels/Windows/ImageWindowViewModel.cs
@@ -13,21 +13,22 @@ namespace Aaru.Tui.ViewModels.Windows;
 
 public sealed partial class ImageWindowViewModel : ViewModelBase
 {
-    readonly string      _filename;
     readonly IMediaImage _imageFormat;
     readonly Window      _parent;
     readonly Window      _view;
     [ObservableProperty]
+    public string _filePath;
+    [ObservableProperty]
     bool _isStatusVisible;
     [ObservableProperty]
     ObservableCollection<FileSystemModelNode> _nodes;
     [ObservableProperty]
     string? _status;
 
-    public ImageWindowViewModel(Window parent, Window view, IMediaImage imageFormat, string filename)
+    public ImageWindowViewModel(Window parent, Window view, IMediaImage imageFormat, string filePath)
     {
         _imageFormat = imageFormat;
-        _filename    = filename;
+        FilePath     = filePath;
         _view        = view;
         _parent      = parent;
 
@@ -60,7 +61,7 @@ public sealed partial class ImageWindowViewModel : ViewModelBase
         IsStatusVisible = true;
         Status          = "Loading partitions...";
 
-        Nodes = new ObservableCollection<FileSystemModelNode>();
+        Nodes = [];
 
         List<Partition>? partitionsList = Core.Partitions.GetAll(_imageFormat);
 
@@ -98,8 +99,11 @@ public sealed partial class ImageWindowViewModel : ViewModelBase
                     if(!plugins.Filesystems.TryGetValue(pluginName, out IFilesystem? fs)) continue;
                     if(fs is null) continue;
 
-                    var fsNode = new FileSystemModelNode(fs.Name);
-                    fsNode.Filesystem = fs;
+                    var fsNode = new FileSystemModelNode(fs.Name)
+                    {
+                        Filesystem = fs
+                    };
+
                     subNodes.Add(fsNode);
                 }
 
diff --git a/Aaru.Tui/ViewModels/Windows/MainWindowViewModel.cs b/Aaru.Tui/ViewModels/Windows/MainWindowViewModel.cs
index 002685547..5c36a8287 100644
--- a/Aaru.Tui/ViewModels/Windows/MainWindowViewModel.cs
+++ b/Aaru.Tui/ViewModels/Windows/MainWindowViewModel.cs
@@ -305,8 +305,7 @@ public sealed partial class MainWindowViewModel : ViewModelBase
 
         var imageWindow = new ImageWindow();
 
-        var imageViewModel =
-            new ImageWindowViewModel(_view, imageWindow, SelectedFile.ImageFormat, SelectedFile.Filename);
+        var imageViewModel = new ImageWindowViewModel(_view, imageWindow, SelectedFile.ImageFormat, SelectedFile.Path);
 
         imageWindow.DataContext = imageViewModel;
         imageWindow.Show();
diff --git a/Aaru.Tui/Views/Windows/ImageWindow.axaml b/Aaru.Tui/Views/Windows/ImageWindow.axaml
index eeee651c0..254f6b42b 100644
--- a/Aaru.Tui/Views/Windows/ImageWindow.axaml
+++ b/Aaru.Tui/Views/Windows/ImageWindow.axaml
@@ -27,9 +27,13 @@
                 <brushes:LineBrush LineStyle="DoubleLine"
                                    Brush="Blue" />
             </Border.BorderBrush>
-            <Grid RowDefinitions="*,Auto">
+            <Grid RowDefinitions="Auto,*,Auto">
+                <TextBlock Grid.Row="0"
+                           Text="{Binding FilePath, Mode=OneWay}"
+                           Foreground="Green"
+                           HorizontalAlignment="Center" />
                 <Grid ColumnDefinitions="*,*"
-                      Grid.Row="0">
+                      Grid.Row="1">
                     <TreeView Grid.Column="0"
                               ItemsSource="{Binding Nodes, Mode=OneWay}"
                               BorderThickness="1">
@@ -44,7 +48,7 @@
                         </TreeView.ItemTemplate>
                     </TreeView>
                 </Grid>
-                <TextBlock Grid.Row="1"
+                <TextBlock Grid.Row="2"
                            Text="{Binding Status, Mode=OneWay}"
                            IsVisible="{Binding IsStatusVisible, Mode=OneWay}" />
             </Grid>
diff --git a/Aaru.Tui/Views/Windows/MainWindow.axaml.cs b/Aaru.Tui/Views/Windows/MainWindow.axaml.cs
index 5f2158709..a1bbaac1b 100644
--- a/Aaru.Tui/Views/Windows/MainWindow.axaml.cs
+++ b/Aaru.Tui/Views/Windows/MainWindow.axaml.cs
@@ -5,7 +5,7 @@ using Avalonia.Interactivity;
 
 namespace Aaru.Tui.Views.Windows;
 
-public class MainWindow : Window
+public partial class MainWindow : Window
 {
     public MainWindow()
     {