diff --git a/src/Misc/MainForm.cs b/src/Misc/MainForm.cs
index d513db5..d0af47c 100644
--- a/src/Misc/MainForm.cs
+++ b/src/Misc/MainForm.cs
@@ -244,7 +244,7 @@ namespace mpvnet
 
                     foreach (MediaTrack track in vidTracks)
                     {
-                        var mi = new WpfControls.MenuItem() { Header = track.Text };
+                        var mi = new WpfControls.MenuItem() { Header = track.Text.Replace("_", "__") };
                         mi.Click += (sender, args) => Core.CommandV("set", "vid", track.ID.ToString());
                         mi.IsChecked = Core.VID == track.ID.ToString();
                         trackMenuItem.Items.Add(mi);
@@ -255,7 +255,7 @@ namespace mpvnet
 
                     foreach (MediaTrack track in audTracks)
                     {
-                        var mi = new WpfControls.MenuItem() { Header = track.Text };
+                        var mi = new WpfControls.MenuItem() { Header = track.Text.Replace("_", "__") };
                         mi.Click += (sender, args) => Core.CommandV("set", "aid", track.ID.ToString());
                         mi.IsChecked = Core.AID == track.ID.ToString();
                         trackMenuItem.Items.Add(mi);
@@ -266,7 +266,7 @@ namespace mpvnet
 
                     foreach (MediaTrack track in subTracks)
                     {
-                        var mi = new WpfControls.MenuItem() { Header = track.Text };
+                        var mi = new WpfControls.MenuItem() { Header = track.Text.Replace("_", "__") };
                         mi.Click += (sender, args) => Core.CommandV("set", "sid", track.ID.ToString());
                         mi.IsChecked = Core.SID == track.ID.ToString();
                         trackMenuItem.Items.Add(mi);
@@ -285,7 +285,7 @@ namespace mpvnet
 
                     foreach (MediaTrack track in ediTracks)
                     {
-                        var mi = new WpfControls.MenuItem() { Header = track.Text };
+                        var mi = new WpfControls.MenuItem() { Header = track.Text.Replace("_", "__") };
                         mi.Click += (sender, args) => Core.CommandV("set", "edition", track.ID.ToString());
                         mi.IsChecked = Core.Edition == track.ID;
                         trackMenuItem.Items.Add(mi);
diff --git a/src/Misc/Misc.cs b/src/Misc/Misc.cs
index a4b1a05..55aedd6 100644
--- a/src/Misc/Misc.cs
+++ b/src/Misc/Misc.cs
@@ -136,7 +136,7 @@ namespace mpvnet
     {
         public int ID { get; set; }
         public bool External { get; set; }
-        public string Text { get; set; }
+        public string Text { get; set; } = "";
         public string Type { get; set; }
     }
 
diff --git a/src/Misc/Player.cs b/src/Misc/Player.cs
index 270b4e5..d9a2954 100644
--- a/src/Misc/Player.cs
+++ b/src/Misc/Player.cs
@@ -1476,7 +1476,7 @@ namespace mpvnet
                 string filename = GetPropertyString($"filename/no-ext");
                 string title = GetPropertyString($"track-list/{i}/title").Replace(filename, "");
 
-                title = Regex.Replace(title, @"^[\._\-]", "").Replace("_", "__");
+                title = Regex.Replace(title, @"^[\._\-]", "");
 
                 if (type == "video")
                 {