diff --git a/installer/PowerToysSetup/Product.wxs b/installer/PowerToysSetup/Product.wxs
index ef3f5db748e4..4c617e370a96 100644
--- a/installer/PowerToysSetup/Product.wxs
+++ b/installer/PowerToysSetup/Product.wxs
@@ -900,6 +900,9 @@
         <RegistryKey Root="HKLM" Key="Software\Classes\AllFileSystemObjects\ShellEx\ContextMenuHandlers\FileLocksmithExt">
           <RegistryValue Type="string" Value="{84D68575-E186-46AD-B0CB-BAEB45EE29C0}"/>
         </RegistryKey>
+        <RegistryKey Root="HKLM" Key="Software\Classes\Drive\ShellEx\ContextMenuHandlers\FileLocksmithExt">
+          <RegistryValue Type="string" Value="{84D68575-E186-46AD-B0CB-BAEB45EE29C0}"/>
+        </RegistryKey>
         </Component>
     </DirectoryRef>
 
diff --git a/src/modules/FileLocksmith/FileLocksmithLibInterop/FileLocksmith.cpp b/src/modules/FileLocksmith/FileLocksmithLibInterop/FileLocksmith.cpp
index d6ef73abefb6..ebec97e42376 100644
--- a/src/modules/FileLocksmith/FileLocksmithLibInterop/FileLocksmith.cpp
+++ b/src/modules/FileLocksmith/FileLocksmithLibInterop/FileLocksmith.cpp
@@ -55,7 +55,7 @@ std::vector<ProcessResult> find_processes_recursive(const std::vector<std::wstri
 
         for (const auto& [dir_kernel_name, dir_path] : kernel_names_dirs)
         {
-            if (starts_with(kernel_name, dir_kernel_name + L"\\"))
+            if (starts_with(kernel_name, dir_kernel_name + (dir_kernel_name.length()>0&&dir_kernel_name[dir_kernel_name.length()-1]!=L'\\' ? L"\\" : L"")))
             {
                 return dir_path + kernel_name.substr(dir_kernel_name.size());
             }
diff --git a/src/modules/FileLocksmith/FileLocksmithUI/Converters/FileListToDescriptionConverter.cs b/src/modules/FileLocksmith/FileLocksmithUI/Converters/FileListToDescriptionConverter.cs
index d38426e0afd4..4ea7687b13c3 100644
--- a/src/modules/FileLocksmith/FileLocksmithUI/Converters/FileListToDescriptionConverter.cs
+++ b/src/modules/FileLocksmith/FileLocksmithUI/Converters/FileListToDescriptionConverter.cs
@@ -18,13 +18,26 @@ public object Convert(object value, Type targetType, object parameter, string la
             {
                 return string.Empty;
             }
-            else if (paths.Length == 1)
+
+            string firstPath = paths[0];
+            firstPath = Path.GetFileName(paths[0]);
+            if (string.IsNullOrEmpty(firstPath))
+            {
+                firstPath = Path.GetDirectoryName(paths[0]);
+            }
+
+            if (string.IsNullOrEmpty(firstPath))
+            {
+                firstPath = Path.GetPathRoot(paths[0]);
+            }
+
+            if (paths.Length == 1)
             {
-                return Path.GetFileName(paths[0]);
+                return firstPath;
             }
             else
             {
-                return Path.GetFileName(paths[0]) + "; +" + (paths.Length - 1);
+                return firstPath + "; +" + (paths.Length - 1);
             }
         }