diff --git a/base/applications/rapps/geninst.cpp b/base/applications/rapps/geninst.cpp
index ba57b53b502..8e96e9e280e 100644
--- a/base/applications/rapps/geninst.cpp
+++ b/base/applications/rapps/geninst.cpp
@@ -309,6 +309,9 @@ CreateShortcut(const CStringW &Target)
     {
         if (SUCCEEDED(hr = link->SetPath(Target)))
         {
+            SplitFileAndDirectory(Target, &tmp);
+            link->SetWorkingDirectory(tmp);
+
             if (SUCCEEDED(GetCustomIconPath(Info, tmp)))
             {
                 LPWSTR p = tmp.GetBuffer();