diff --git a/src/Ryujinx/App.axaml.cs b/src/Ryujinx/App.axaml.cs
index 35335eda50..8c36d1853b 100644
--- a/src/Ryujinx/App.axaml.cs
+++ b/src/Ryujinx/App.axaml.cs
@@ -134,8 +134,7 @@ namespace Ryujinx.Ava
 
         private ThemeVariant DetectSystemTheme()
         {
-            var platformSettings = this.PlatformSettings;
-            var colorValues = platformSettings.GetColorValues();
+            var colorValues = PlatformSettings.GetColorValues();
 
             return ConvertThemeVariant(colorValues.ThemeVariant);
         }
diff --git a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
index dfd8b8a39f..45c647bf58 100644
--- a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
@@ -100,10 +100,10 @@ namespace Ryujinx.Ava.UI.Windows
         protected override void OnClosed(EventArgs e)
         {
             base.OnClosed(e);
-            if (this.PlatformSettings != null)
+            if (PlatformSettings != null)
             {
                 // Unsubscribe to the ColorValuesChanged event
-                this.PlatformSettings.ColorValuesChanged -= OnPlatformColorValuesChanged;
+                PlatformSettings.ColorValuesChanged -= OnPlatformColorValuesChanged;
             }
         }
 
@@ -391,7 +391,7 @@ namespace Ryujinx.Ava.UI.Windows
             Initialize();
 
             // Subscribe to the ColorValuesChanged event
-            this.PlatformSettings.ColorValuesChanged += OnPlatformColorValuesChanged;
+            PlatformSettings.ColorValuesChanged += OnPlatformColorValuesChanged;
 
             ViewModel.Initialize(
                 ContentManager,