diff --git a/MediaBrowser.Controller/IO/FileData.cs b/MediaBrowser.Controller/IO/FileData.cs
index 79ba0a64fa..6d18070ad7 100644
--- a/MediaBrowser.Controller/IO/FileData.cs
+++ b/MediaBrowser.Controller/IO/FileData.cs
@@ -50,7 +50,20 @@ namespace MediaBrowser.Controller.IO
 
                     var data = FileSystem.GetFileSystemInfo(newPath);
 
-                    dict[data.FullName] = data;
+                    if (data.Exists)
+                    {
+                        // Find out if the shortcut is pointing to a directory or file
+                        if (data.Attributes.HasFlag(FileAttributes.Directory))
+                        {
+                            // add to our physical locations
+                            if (args != null)
+                            {
+                                args.AddAdditionalLocation(newPath);
+                            }
+                        }
+
+                        dict[data.FullName] = data;
+                    }
                 }
                 else if (flattenFolderDepth > 0 && isDirectory)
                 {
diff --git a/MediaBrowser.Controller/IO/FileSystem.cs b/MediaBrowser.Controller/IO/FileSystem.cs
index 04eefd4a12..e5f80533aa 100644
--- a/MediaBrowser.Controller/IO/FileSystem.cs
+++ b/MediaBrowser.Controller/IO/FileSystem.cs
@@ -34,7 +34,7 @@ namespace MediaBrowser.Controller.IO
             {
                 var fileInfo = new DirectoryInfo(path);
 
-                if (fileInfo.Exists || path.EndsWith(":\\", StringComparison.OrdinalIgnoreCase))
+                if (fileInfo.Exists)
                 {
                     return fileInfo;
                 }