diff --git a/docs/Changelog.md b/docs/Changelog.md
index 46a6084..1043abc 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -10,6 +10,7 @@
 - Profile selection in the context menu.
 - Use defaults in case settings.xml fails loading (not reproducible).
 - conf editor support for keepaspect-window.
+- Drawing flicker in the command palette (playlist) was fixed.
 - libmpv shinchiro 2021-07-18
 
 
diff --git a/src/WinForms/MainForm.cs b/src/WinForms/MainForm.cs
index 49adbb4..4ec1f3c 100644
--- a/src/WinForms/MainForm.cs
+++ b/src/WinForms/MainForm.cs
@@ -1096,12 +1096,16 @@ namespace mpvnet
         {
             if (CommandPaletteHost != null)
             {
+                CommandPaletteHost.Visible = false;
+                CommandPalette.Instance.Items.Clear();
+                CommandPalette.Instance.SearchControl.SearchTextBox.Text = "";
+                CommandPalette.Instance.UpdateLayout();
+
                 ActiveControl = null;
                 Controls.Remove(CommandPaletteHost);
                 CommandPaletteHost.Child = null;
                 CommandPaletteHost.Dispose();
                 CommandPaletteHost = null;
-                CommandPalette.Instance.SearchControl.SearchTextBox.Text = "";
             }
         }