diff --git a/src/Files.App/Assets/FilesOpenDialog/FilesLauncher.exe b/src/Files.App/Assets/FilesOpenDialog/FilesLauncher.exe
index e06558c5e80e..4f47b29ea154 100644
Binary files a/src/Files.App/Assets/FilesOpenDialog/FilesLauncher.exe and b/src/Files.App/Assets/FilesOpenDialog/FilesLauncher.exe differ
diff --git a/src/Files.OpenDialog/FilesLauncher/FilesLauncher.cpp b/src/Files.OpenDialog/FilesLauncher/FilesLauncher.cpp
index 8eba6bf5f9ab..6e5e0423cfde 100644
--- a/src/Files.OpenDialog/FilesLauncher/FilesLauncher.cpp
+++ b/src/Files.OpenDialog/FilesLauncher/FilesLauncher.cpp
@@ -49,7 +49,7 @@ int WINAPI WinMain(HINSTANCE hInstance,
 	LPWSTR* szArglist = CommandLineToArgvW(GetCommandLine(), &numArgs);
 	WCHAR openDirectory[MAX_PATH];
 
-	if (numArgs > 1)
+	if (numArgs > 1 && wcsnlen(szArglist[1], 1))
 	{
 		swprintf(openDirectory, _countof(openDirectory) - 1, L"%s", szArglist[1]);
 		std::wcout << openDirectory << std::endl;
@@ -199,8 +199,7 @@ int WINAPI WinMain(HINSTANCE hInstance,
 		SHELLEXECUTEINFO ShExecInfo = { 0 };
 		ShExecInfo.cbSize = sizeof(SHELLEXECUTEINFO);
 		ShExecInfo.fMask = SEE_MASK_NOASYNC | SEE_MASK_FLAG_NO_UI;
-		ShExecInfo.lpFile = L"files-uwp:?cmd=";
-		ShExecInfo.lpDirectory = openDirectory;
+		ShExecInfo.lpFile = L"files-uwp:";
 		ShExecInfo.nShow = SW_SHOW;
 
 		if (!ShellExecuteEx(&ShExecInfo))