diff --git a/MediaBrowser.Controller/IO/FileData.cs b/MediaBrowser.Controller/IO/FileData.cs
index 789007be7c..b7a6579daf 100644
--- a/MediaBrowser.Controller/IO/FileData.cs
+++ b/MediaBrowser.Controller/IO/FileData.cs
@@ -22,6 +22,7 @@ namespace MediaBrowser.Controller.IO
         {
             WIN32_FIND_DATA data;
             IntPtr handle = FindFirstFile(path, out data);
+            bool getFilename = false;
 
             if (handle == INVALID_HANDLE_VALUE && !Path.HasExtension(path))
             {
@@ -32,6 +33,8 @@ namespace MediaBrowser.Controller.IO
                     FindClose(handle);
 
                     handle = FindFirstFile(Path.Combine(path, "*"), out data);
+
+                    getFilename = true;
                 }
             }
 
@@ -39,6 +42,11 @@ namespace MediaBrowser.Controller.IO
             {
                 throw new IOException("FindFirstFile failed");
             }
+
+            if (getFilename)
+            {
+                data.cFileName = Path.GetFileName(path);
+            }
             
             FindClose(handle);