diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/FileSystemTree.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/FileSystemTree.cs
index 06a5863da3..35a5b3129a 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/FileSystemTree.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/FileSystemTree.cs
@@ -8,6 +8,7 @@ using System.Web.UI.WebControls;
 using System.Web.UI.WebControls.WebParts;
 using System.Web.UI.HtmlControls;
 using System.IO;
+using Umbraco.Core;
 using Umbraco.Core.IO;
 
 namespace umbraco.cms.presentation.Trees
@@ -41,8 +42,8 @@ namespace umbraco.cms.presentation.Trees
             string path = "";
             if (!string.IsNullOrEmpty(this.NodeKey))
             {
-                orgPath = this.NodeKey;
-                path = IOHelper.MapPath(FilePath+ "/" + orgPath + "/");
+                orgPath = this.NodeKey.EnsureEndsWith('/');
+                path = IOHelper.MapPath($"{FilePath.EnsureEndsWith('/')}{orgPath}");
             }
             else
             {