diff --git a/Files.Launcher/Program.cs b/Files.Launcher/Program.cs
index a40340c18e83..5076d4e5d3de 100644
--- a/Files.Launcher/Program.cs
+++ b/Files.Launcher/Program.cs
@@ -866,7 +866,6 @@ private static async void HandleApplicationLaunch(string application, Dictionary
             {
                 using Process process = new Process();
                 process.StartInfo.UseShellExecute = true;
-                process.StartInfo.Verb = "runas";
                 process.StartInfo.FileName = application;
                 process.StartInfo.CreateNoWindow = true;
                 process.StartInfo.Arguments = arguments;
diff --git a/Files/BaseLayout.cs b/Files/BaseLayout.cs
index 6982010aac25..535cf966f72e 100644
--- a/Files/BaseLayout.cs
+++ b/Files/BaseLayout.cs
@@ -241,7 +241,7 @@ public virtual void SetShellContextmenu(MenuFlyout menuFlyout, bool shiftPressed
                     { "Arguments", "LoadContextMenu" },
                     { "FilePath", IsItemSelected ?
                         string.Join('|', selectedItems.Select(x => x.ItemPath)) :
-                        ParentShellPageInstance.FilesystemViewModel.CurrentFolder.ItemPath},
+                        ParentShellPageInstance.FilesystemViewModel.WorkingDirectory },
                     { "ExtendedMenu", shiftPressed },
                     { "ShowOpenMenu", showOpenMenu }
                 })).Result;