diff --git a/OngekiFumenEditor/Kernel/ProgramUpdater/DefaultProgramUpdater.cs b/OngekiFumenEditor/Kernel/ProgramUpdater/DefaultProgramUpdater.cs
index e51cab10..948a61d7 100644
--- a/OngekiFumenEditor/Kernel/ProgramUpdater/DefaultProgramUpdater.cs
+++ b/OngekiFumenEditor/Kernel/ProgramUpdater/DefaultProgramUpdater.cs
@@ -43,7 +43,7 @@ public bool HasNewVersion
         {
             get
             {
-                if (RemoteVersionInfo.Version is not Version remoteVersion)
+                if (RemoteVersionInfo?.Version is not Version remoteVersion)
                     return false;
                 var localVersion = Version.Parse(ThisAssembly.AssemblyFileVersion);
 
@@ -64,8 +64,11 @@ public VersionInfo RemoteVersionInfo
                 Set(ref remoteVersionInfo, value);
                 NotifyOfPropertyChange(nameof(HasNewVersion));
 
-                if (updatableButton is not null)
-                    updatableButton.Visibility = HasNewVersion ? Visibility.Visible : Visibility.Collapsed;
+                App.Current.Dispatcher.Invoke(() =>
+                {
+                    if (updatableButton is not null)
+                        updatableButton.Visibility = HasNewVersion ? Visibility.Visible : Visibility.Collapsed;
+                });
             }
         }
 
@@ -172,7 +175,7 @@ public async Task CheckUpdatable()
             }
 
             if ((App.Current as App)?.IsGUIMode ?? false)
-                ModifyFrameworkMenuView();
+                App.Current.Dispatcher.Invoke(ModifyFrameworkMenuView);
 
             try
             {