diff --git a/Speculator/Speculator/ViewModels/RomSelectorViewModel.cs b/Speculator/Speculator/ViewModels/RomSelectorViewModel.cs
index 55b6b5c..cba825e 100644
--- a/Speculator/Speculator/ViewModels/RomSelectorViewModel.cs
+++ b/Speculator/Speculator/ViewModels/RomSelectorViewModel.cs
@@ -46,7 +46,7 @@ public RomSelectorViewModel(ZxSpectrum speccy)
 
         LoadBasicRomAction = romFile =>
         {
-            speccy.LoadBasicRom(romFile);
+            speccy.LoadBasicRom(romFile ?? RomFile);
 
             Settings.Instance.RomFile = romFile;
             Settings.Instance.UseSpeccyColors = UseSpeccyColors;
diff --git a/Speculator/Speculator/Views/MainWindow.axaml.cs b/Speculator/Speculator/Views/MainWindow.axaml.cs
index b70c8c6..847791d 100644
--- a/Speculator/Speculator/Views/MainWindow.axaml.cs
+++ b/Speculator/Speculator/Views/MainWindow.axaml.cs
@@ -11,10 +11,12 @@
 
 using System;
 using System.Linq;
+using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Platform.Storage;
+using Avalonia.Threading;
 using CSharp.Utils.Extensions;
 using CSharp.Utils.UI;
 using Material.Icons.Avalonia;