diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml
index c46fe77..153c7c1 100644
--- a/.github/workflows/dotnet-desktop.yml
+++ b/.github/workflows/dotnet-desktop.yml
@@ -34,7 +34,7 @@ jobs:
     - name: Install .NET Core
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     # Add MSBuild to the PATH
     - name: Setup MSBuild.exe
@@ -72,7 +72,7 @@ jobs:
 
     # Build the application
     - name: Build the application
-      run: dotnet publish $env:Solution_Name -c Release -r win-x64 --self-contained true -p:PublishSingleFile=true --property:PublishDir=./publish
+      run: dotnet publish $env:Solution_Name -c Release -r win-x64 --self-contained true -p:PublishSingleFile=true -p:PublishReadyToRun=true --property:PublishDir=./publish
       env:
         Configuration: ${{ matrix.configuration }}
 
diff --git a/ToNSaveManager.csproj b/ToNSaveManager.csproj
index d0e90a5..43b2177 100644
--- a/ToNSaveManager.csproj
+++ b/ToNSaveManager.csproj
@@ -2,13 +2,14 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWindowsForms>true</UseWindowsForms>
     <ImplicitUsings>enable</ImplicitUsings>
     <ApplicationIcon>Resources\icon.ico</ApplicationIcon>
     <Version>1.0.0.1</Version>
     <FileVersion>1.0.0.1</FileVersion>
+    <SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Windows/SettingsWindow.cs b/Windows/SettingsWindow.cs
index 2280418..1ee5060 100644
--- a/Windows/SettingsWindow.cs
+++ b/Windows/SettingsWindow.cs
@@ -238,7 +238,7 @@ private void ClickTimer_Tick(object? sender, EventArgs e) {
         }
 
         private void languageSelectBox_SelectedIndexChanged(object sender, EventArgs e) {
-            if (!FilledLanguages || languageSelectBox.SelectedIndex < 0) return;
+            if (!FilledLanguages || languageSelectBox.SelectedIndex < 0 || languageSelectBox.SelectedItem == null) return;
             LANG.LangKey langKey = (LANG.LangKey)languageSelectBox.SelectedItem;
 
             if (LANG.SelectedKey != langKey.Key) {