diff --git a/Changelog.md b/Changelog.md
index ddb6482..f37ef49 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,7 @@
 5.4.8.6 Beta (not yet released)
 ============
 
+- Filename not being always shown in title bar. (#214)
 - Improved OSD message when cycling audio.
 - Finally support DVD audio and subtitle track selection.
 - Profiles can be shown on the command line with --profile=help
diff --git a/mpv.net/WPF/AboutWindow.xaml b/mpv.net/WPF/AboutWindow.xaml
index 070ba69..5370cdc 100644
--- a/mpv.net/WPF/AboutWindow.xaml
+++ b/mpv.net/WPF/AboutWindow.xaml
@@ -7,19 +7,18 @@
         mc:Ignorable="d"
         
         Title="About mpv.net"
-        Height="230"
-        Width="400"
         FontSize="16"
         ShowInTaskbar="False"
         WindowStartupLocation="CenterOwner"
         ResizeMode="NoResize"
+        SizeToContent="WidthAndHeight"
         Foreground="{x:Static mpvnet:Theme.Foreground}"
         Background="{x:Static mpvnet:Theme.Background}">
     
     <Grid>
-        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-            <TextBlock FontSize="48" HorizontalAlignment="Center" Margin="0,0,0,10">mpv.net</TextBlock>
-            <TextBlock Name="ContentBlock" TextAlignment="Center"></TextBlock>
+        <StackPanel HorizontalAlignment="Center">
+            <TextBlock FontSize="30" TextAlignment="Center"  Margin="10,10,10,0">mpv.net</TextBlock>
+            <TextBlock Name="ContentBlock" TextAlignment="Center" Margin="20,10,20,20"></TextBlock>
         </StackPanel>
     </Grid>
 </Window>
\ No newline at end of file
diff --git a/mpv.net/WPF/AboutWindow.xaml.cs b/mpv.net/WPF/AboutWindow.xaml.cs
index d711b09..22a337d 100644
--- a/mpv.net/WPF/AboutWindow.xaml.cs
+++ b/mpv.net/WPF/AboutWindow.xaml.cs
@@ -12,7 +12,7 @@ namespace mpvnet
         public AboutWindow()
         {
             InitializeComponent();
-            ContentBlock.Text= "Copyright (C) 2017-2020 Frank Skare (stax76)\n" +
+            ContentBlock.Text= "Copyright (C) 2017-2020 Frank Skare\n" +
                 $"mpv.net {System.Windows.Forms.Application.ProductVersion} ({File.GetLastWriteTime(System.Windows.Forms.Application.ExecutablePath).ToShortDateString()})\n" +
                 $"{core.get_property_string("mpv-version")} ({File.GetLastWriteTime(Folder.Startup + "mpv-1.dll").ToShortDateString()})\nffmpeg {core.get_property_string("ffmpeg-version")}\nMIT License";
         }
diff --git a/mpv.net/WinForms/MainForm.cs b/mpv.net/WinForms/MainForm.cs
index cae1d14..a375e14 100644
--- a/mpv.net/WinForms/MainForm.cs
+++ b/mpv.net/WinForms/MainForm.cs
@@ -488,10 +488,8 @@ namespace mpvnet
             BeginInvoke(new Action(() => {
                 if (path.Contains("://"))
                     Text = core.get_property_string("media-title") + " - mpv.net " + Application.ProductVersion;
-                else if (path.Contains(":\\") || path.StartsWith("\\\\"))
-                    Text = path.FileName() + " - mpv.net " + Application.ProductVersion;
                 else
-                    Text = "mpv.net " + Application.ProductVersion;
+                    Text = path.FileName() + " - mpv.net " + Application.ProductVersion;
 
                 int interval = (int)(core.Duration.TotalMilliseconds / 100);
 
diff --git a/mpv.net/mpv/Core.cs b/mpv.net/mpv/Core.cs
index d13860a..48c0810 100644
--- a/mpv.net/mpv/Core.cs
+++ b/mpv.net/mpv/Core.cs
@@ -1164,7 +1164,12 @@ namespace mpvnet
             if (!File.Exists(path) || get_property_int("playlist-count") != 1)
                 return;
 
-            List<string> files = Directory.GetFiles(Path.GetDirectoryName(path)).ToList();
+            string dir = Environment.CurrentDirectory;
+
+            if (path.Contains(Path.DirectorySeparatorChar))
+                dir = Path.GetDirectoryName(path);
+
+            List<string> files = Directory.GetFiles(dir).ToList();
 
             files = files.Where(file =>
                 App.VideoTypes.Contains(file.Ext()) ||