diff --git a/Ryujinx.Ava/UI/Windows/SettingsWindow.axaml.cs b/Ryujinx.Ava/UI/Windows/SettingsWindow.axaml.cs
index 9522c5d6a..07d5c19b3 100644
--- a/Ryujinx.Ava/UI/Windows/SettingsWindow.axaml.cs
+++ b/Ryujinx.Ava/UI/Windows/SettingsWindow.axaml.cs
@@ -5,6 +5,7 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.HLE.FileSystem;
 using System;
+using System.ComponentModel;
 
 namespace Ryujinx.Ava.UI.Windows
 {
@@ -109,5 +110,12 @@ namespace Ryujinx.Ava.UI.Windows
         {
             ViewModel.ApplyButton();
         }
+
+        protected override void OnClosing(CancelEventArgs e)
+        {
+            HotkeysPage.Dispose();
+            InputPage.Dispose();
+            base.OnClosing(e);
+        }
     }
 }
\ No newline at end of file