diff --git a/dll/cpl/appwiz/createlink.c b/dll/cpl/appwiz/createlink.c
index acce1443d3d..516a140539a 100644
--- a/dll/cpl/appwiz/createlink.c
+++ b/dll/cpl/appwiz/createlink.c
@@ -635,7 +635,7 @@ CALLBACK
 NewLinkHereW(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
 {
     InitCommonControls();
-    return ShowCreateShortcutWizard(hwndCPl, (LPWSTR)lParam1);
+    return ShowCreateShortcutWizard(hwndCPl, (LPCWSTR)lParam1);
 }
 
 LONG
@@ -644,10 +644,7 @@ NewLinkHereA(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
 {
     WCHAR szFile[MAX_PATH];
 
-    if (MultiByteToWideChar(CP_ACP, 0, (LPSTR)lParam1, -1, szFile, _countof(szFile)))
-    {
-        InitCommonControls();
-        return ShowCreateShortcutWizard(hwndCPl, szFile);
-    }
+    if (MultiByteToWideChar(CP_ACP, 0, (LPCSTR)lParam1, -1, szFile, _countof(szFile)))
+        return NewLinkHereW(hwndCPl, uMsg, (LPARAM)szFile, lParam2);
     return -1;
 }