diff --git a/Dalamud/Game/Command/CommandManager.cs b/Dalamud/Game/Command/CommandManager.cs
index 078ce8c50..fdaa5833b 100644
--- a/Dalamud/Game/Command/CommandManager.cs
+++ b/Dalamud/Game/Command/CommandManager.cs
@@ -10,6 +10,7 @@ using Dalamud.IoC.Internal;
 using Dalamud.Logging.Internal;
 using Dalamud.Plugin.Internal.Types;
 using Dalamud.Plugin.Services;
+using Dalamud.Utility;
 
 using FFXIVClientStructs.FFXIV.Client.System.String;
 using FFXIVClientStructs.FFXIV.Client.UI;
@@ -149,6 +150,11 @@ internal sealed unsafe class CommandManager : IInternalDisposableService, IComma
     /// <inheritdoc/>
     public bool RemoveHandler(string command)
     {
+        if (this.commandAssemblyNameMap.FindFirst(c => c.Key.Item1 == command, out var assemblyKeyValuePair))
+        {
+            this.commandAssemblyNameMap.TryRemove(assemblyKeyValuePair.Key, out _);
+        }
+
         return this.commandMap.Remove(command, out _);
     }
 
diff --git a/Dalamud/Interface/ImGuiFileDialog/FileDialog.Files.cs b/Dalamud/Interface/ImGuiFileDialog/FileDialog.Files.cs
index 121ec8890..705c0f100 100644
--- a/Dalamud/Interface/ImGuiFileDialog/FileDialog.Files.cs
+++ b/Dalamud/Interface/ImGuiFileDialog/FileDialog.Files.cs
@@ -36,6 +36,20 @@ public partial class FileDialog
 
     private static string ComposeNewPath(List<string> decomp)
     {
+        // Handle UNC paths (network paths)
+        if (decomp.Count >= 2 && string.IsNullOrEmpty(decomp[0]) && string.IsNullOrEmpty(decomp[1]))
+        {
+            var pathParts = new List<string>(decomp);
+            pathParts.RemoveRange(0, 2);
+            // Can not access server level or UNC root
+            if (pathParts.Count <= 1)
+            {
+                return string.Empty;
+            }
+
+            return $"\\\\{string.Join('\\', pathParts)}";
+        }
+        
         if (decomp.Count == 1)
         {
             var drivePath = decomp[0];