diff --git a/Oqtane.Client/Modules/Admin/Files/Edit.razor b/Oqtane.Client/Modules/Admin/Files/Edit.razor
index e69b44aa..05990fe4 100644
--- a/Oqtane.Client/Modules/Admin/Files/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Files/Edit.razor
@@ -67,6 +67,7 @@
             </div>
         </div>
     </form>
+    <br /><br />
 
     @if (!_isSystem)
     {
@@ -79,8 +80,7 @@
         @((MarkupString)"&nbsp;")
         <ActionDialog Header="Delete Folder" Message="Are You Sure You Wish To Delete This Folder?" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteFolder())" ResourceKey="DeleteFolder" />
     }
-    <br />
-    <br />
+    <br /><br />
     @if (PageState.QueryString.ContainsKey("id"))
     {
         <AuditInfo CreatedBy="@_createdBy" CreatedOn="@_createdOn" ModifiedBy="@_modifiedBy" ModifiedOn="@_modifiedOn"></AuditInfo>
diff --git a/Oqtane.Shared/Shared/Utilities.cs b/Oqtane.Shared/Shared/Utilities.cs
index b5a7493e..49bd3fec 100644
--- a/Oqtane.Shared/Shared/Utilities.cs
+++ b/Oqtane.Shared/Shared/Utilities.cs
@@ -389,10 +389,12 @@ namespace Oqtane.Shared
         }
 
         public static string UrlCombine(params string[] segments)
-{
+        {
             segments = segments.Where(item => !string.IsNullOrEmpty(item) && item != "/" && item != "\\").ToArray();
-            for (int i = 1; i < segments.Length; i++)
-            {
+            for (int i = 0; i < segments.Length; i++)
+            {                
+                segments[i] = (segments[i].StartsWith("/") || segments[i].StartsWith("\\")) ? segments[i].Substring(1) : segments[i];
+                segments[i] = (segments[i].EndsWith("/") || segments[i].EndsWith("\\")) ? segments[i].Substring(0, segments[i].Length - 1) : segments[i];
                 segments[i] = segments[i].Replace("\\", "/");
             }
             return string.Join("/", segments);