diff --git a/docs/Changelog.md b/docs/Changelog.md
index 15f5018..3014f70 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -1,5 +1,10 @@
 
-5.4.9.7 Beta (2021-??-??)
+5.4.9.8 Beta (2021-??-??)
+
+5.4.9.7 Beta (2021-08-28)
+
+- Fix exception closing command palette on Windows 7.
+
 
 5.4.9.6 Beta (2021-08-26)
 
diff --git a/src/Misc/MainForm.cs b/src/Misc/MainForm.cs
index 13619ca..23fa5b0 100644
--- a/src/Misc/MainForm.cs
+++ b/src/Misc/MainForm.cs
@@ -1148,6 +1148,15 @@ namespace mpvnet
                 }
             }
 
+            protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
+            {
+                try {
+                    return base.ProcessCmdKey(ref msg, keyData);
+                } catch (Exception) {
+                    return true;
+                }
+            }
+
             [DllImport("user32.dll")]
             public static extern bool SetLayeredWindowAttributes(IntPtr hWnd, int crKey, byte alpha, int dwFlags);
         }
diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs
index 8edb388..3df36c0 100644
--- a/src/Properties/AssemblyInfo.cs
+++ b/src/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.4.9.6")]
-[assembly: AssemblyFileVersion("5.4.9.6")]
+[assembly: AssemblyVersion("5.4.9.7")]
+[assembly: AssemblyFileVersion("5.4.9.7")]
diff --git a/src/WPF/CommandPaletteControl.xaml.cs b/src/WPF/CommandPaletteControl.xaml.cs
index c919c72..5c8548d 100644
--- a/src/WPF/CommandPaletteControl.xaml.cs
+++ b/src/WPF/CommandPaletteControl.xaml.cs
@@ -30,6 +30,7 @@ namespace mpvnet
 
             EscapeCommand = new RelayCommand(OnEscapeCommand);
             ExecuteCommand = new RelayCommand(OnExecuteCommand);
+
             SearchControl.SearchTextBox.PreviewKeyDown += SearchTextBox_PreviewKeyDown;
             SearchControl.SearchTextBox.TextChanged += SearchTextBox_TextChanged;
             SearchControl.HideClearButton = true;