diff --git a/Changelog.md b/Changelog.md
index 33fa2a8..9f29caf 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,7 @@ TODO: fix volume/mute being initialized muted
 ###
 
 - the [scripting wiki page](https://github.com/stax76/mpv.net/wiki/Scripting#powershell) was improved
+- Toggle Shuffle has been added to the menu defaults
 
 ### 5.4.1.1
 
diff --git a/mpv.net/Resources/inputConf.txt b/mpv.net/Resources/inputConf.txt
index 59f928a..e3b59b9 100644
--- a/mpv.net/Resources/inputConf.txt
+++ b/mpv.net/Resources/inputConf.txt
@@ -151,6 +151,7 @@
  Ctrl+r script-message-to repl type ""              #menu: Tools > Show REPL
  l      ab-loop                                     #menu: Tools > Set/clear A-B loop points
  L      cycle-values loop-file "inf" "no"           #menu: Tools > Toggle infinite file looping
+ _      cycle shuffle                               #menu: Tools > Toggle Shuffle
  Ctrl+h cycle-values hwdec "auto" "no"              #menu: Tools > Toggle Hardware Decoding
  _ script-message mpv.net show-setup-dialog         #menu: Tools > OS Setup...
 
diff --git a/mpv.net/WPF/ConfWindow.xaml.cs b/mpv.net/WPF/ConfWindow.xaml.cs
index c1011cf..a866850 100644
--- a/mpv.net/WPF/ConfWindow.xaml.cs
+++ b/mpv.net/WPF/ConfWindow.xaml.cs
@@ -201,7 +201,7 @@ namespace mpvnet
         private void FilterListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             if (e.AddedItems.Count > 0)
-                SearchControl.Text = e.AddedItems[0].ToString() + ":";
+                SearchControl.Text = e.AddedItems[0].ToString() + ":"; // TODO: remove ToString()
         }
 
         private void OpenSettingsTextBlock_MouseUp(object sender, MouseButtonEventArgs e)
diff --git a/mpv.net/WinForms/Menu.cs b/mpv.net/WinForms/Menu.cs
index e585d12..bd1b2b8 100644
--- a/mpv.net/WinForms/Menu.cs
+++ b/mpv.net/WinForms/Menu.cs
@@ -3,7 +3,6 @@ using System.Linq;
 using System.ComponentModel;
 using System.Drawing.Drawing2D;
 using System.Drawing.Text;
-using Microsoft.Win32;
 using System.Windows.Forms;
 using System.Drawing;