diff --git a/ShareX/Forms/ApplicationSettingsForm.cs b/ShareX/Forms/ApplicationSettingsForm.cs
index 6a532efeb..025e390b5 100644
--- a/ShareX/Forms/ApplicationSettingsForm.cs
+++ b/ShareX/Forms/ApplicationSettingsForm.cs
@@ -252,6 +252,9 @@ private void UpdateStartWithWindows()
         {
             ready = false;
 
+            lblWindowsStoreStartupStatus.Text = "";
+            cbStartWithWindows.Enabled = true;
+
             StartupTaskState state = StartupManagerFactory.StartupManager.State;
             cbStartWithWindows.Checked = state == StartupTaskState.Enabled;
             if (state == StartupTaskState.DisabledByUser)
diff --git a/ShareX/ShareX.csproj b/ShareX/ShareX.csproj
index b3a9d14df..62da05299 100644
--- a/ShareX/ShareX.csproj
+++ b/ShareX/ShareX.csproj
@@ -330,7 +330,7 @@
     <Compile Include="StartupManagers\GenericStartupManager.cs" />
     <Compile Include="StartupManagers\IStartupManager.cs" />
     <Compile Include="StartupManagers\StartupManagerFactory.cs" />
-    <Compile Include="StartupManagers\SteamDesktopManager.cs" />
+    <Compile Include="StartupManagers\SteamStartupManager.cs" />
     <Compile Include="TaskHelpers.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/ShareX/StartupManagers/SteamDesktopManager.cs b/ShareX/StartupManagers/SteamStartupManager.cs
similarity index 100%
rename from ShareX/StartupManagers/SteamDesktopManager.cs
rename to ShareX/StartupManagers/SteamStartupManager.cs