diff --git a/docs/Changelog.md b/docs/Changelog.md
index 45b6845..d923735 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -1,5 +1,10 @@
 
-5.4.9.4 Beta (2021-??-??)
+5.4.9.5 Beta (2021-??-??)
+
+5.4.9.4 Beta (2021-08-24)
+
+- Fix of command palette crash on Windows 7.
+
 
 5.4.9.3 Beta (2021-08-22)
 
diff --git a/src/Misc/MainForm.cs b/src/Misc/MainForm.cs
index 0d7fa15..ddb330c 100644
--- a/src/Misc/MainForm.cs
+++ b/src/Misc/MainForm.cs
@@ -1117,14 +1117,19 @@ namespace mpvnet
             {
                 base.OnHandleCreated(e);
                 const int LWA_ColorKey = 1;
-                SetLayeredWindowAttributes(Handle, 0x111111, 255, LWA_ColorKey);
+                
+                if (Environment.OSVersion.Version > new Version(10, 0))
+                    SetLayeredWindowAttributes(Handle, 0x111111, 255, LWA_ColorKey);
             }
 
             protected override CreateParams CreateParams {
                 get {
                     const int WS_EX_LAYERED = 0x00080000;
                     CreateParams cp = base.CreateParams;
-                    cp.ExStyle = cp.ExStyle | WS_EX_LAYERED;
+
+                    if (Environment.OSVersion.Version > new Version(10, 0))
+                        cp.ExStyle = cp.ExStyle | WS_EX_LAYERED;
+
                     return cp;
                 }
             }
diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs
index 6345120..7a21de2 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.3")]
-[assembly: AssemblyFileVersion("5.4.9.3")]
+[assembly: AssemblyVersion("5.4.9.4")]
+[assembly: AssemblyFileVersion("5.4.9.4")]
diff --git a/src/WPF/CommandPaletteControl.xaml b/src/WPF/CommandPaletteControl.xaml
index f8f08e7..45afcbc 100644
--- a/src/WPF/CommandPaletteControl.xaml
+++ b/src/WPF/CommandPaletteControl.xaml
@@ -17,7 +17,8 @@
         <KeyBinding Gesture="Enter"  Command="{Binding ExecuteCommand}"/>
     </UserControl.InputBindings>
 
-    <Border BorderThickness="1,0,1,1"
+    <Border Name="MainBorder"
+            BorderThickness="1,0,1,1"
             CornerRadius="0,0,5,5"
             Padding="0,0,0,5"
             BorderBrush="{Binding Theme.MenuHighlight}"
diff --git a/src/WPF/CommandPaletteControl.xaml.cs b/src/WPF/CommandPaletteControl.xaml.cs
index f912727..c919c72 100644
--- a/src/WPF/CommandPaletteControl.xaml.cs
+++ b/src/WPF/CommandPaletteControl.xaml.cs
@@ -33,6 +33,9 @@ namespace mpvnet
             SearchControl.SearchTextBox.PreviewKeyDown += SearchTextBox_PreviewKeyDown;
             SearchControl.SearchTextBox.TextChanged += SearchTextBox_TextChanged;
             SearchControl.HideClearButton = true;
+
+            if (Environment.OSVersion.Version < new Version(10, 0))
+                MainBorder.CornerRadius = new CornerRadius(0);
         }
 
         void SearchTextBox_TextChanged(object sender, TextChangedEventArgs e)