diff --git a/Ryujinx/Program.cs b/Ryujinx/Program.cs
index fbf1196d0c..9bab74a265 100644
--- a/Ryujinx/Program.cs
+++ b/Ryujinx/Program.cs
@@ -43,7 +43,6 @@ namespace Ryujinx
                 ConfigurationState.Instance.ToFileFormat().SaveConfig(configurationPath);
             }
 
-
             Profile.Initialize();
 
             Application.Init();
diff --git a/Ryujinx/Ui/MainWindow.cs b/Ryujinx/Ui/MainWindow.cs
index 74b3bb681b..f9f3657606 100644
--- a/Ryujinx/Ui/MainWindow.cs
+++ b/Ryujinx/Ui/MainWindow.cs
@@ -239,7 +239,7 @@ namespace Ryujinx.Ui
                 HLE.Switch device = InitializeSwitchInstance();
 
                 // TODO: Move this somewhere else + reloadable?
-                Ryujinx.Graphics.Gpu.GraphicsConfig.ShadersDumpPath = ConfigurationState.Instance.Graphics.ShadersDumpPath;
+                Graphics.Gpu.GraphicsConfig.ShadersDumpPath = ConfigurationState.Instance.Graphics.ShadersDumpPath;
 
                 if (Directory.Exists(path))
                 {
@@ -359,7 +359,7 @@ namespace Ryujinx.Ui
             }
         }
 
-        private static void End(HLE.Switch device)
+        private void End(HLE.Switch device)
         {
             if (_ending)
             {
@@ -373,6 +373,8 @@ namespace Ryujinx.Ui
                 UpdateGameMetadata(device.System.TitleIdText);
             }
 
+            Dispose();
+
             Profile.FinishProfiling();
             device?.Dispose();
             DiscordIntegrationModule.Exit();