diff --git a/src/client/Client.cpp b/src/client/Client.cpp
index dcc243951..bfb2002a3 100644
--- a/src/client/Client.cpp
+++ b/src/client/Client.cpp
@@ -304,6 +304,7 @@ bool Client::DoInstallation()
 	if (CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, IID_IShellLinkW, (LPVOID *)&shellLink) != S_OK)
 		goto finalise;
 	shellLink->SetPath(Platform::WinWiden(currentfilename).c_str());
+	shellLink->SetWorkingDirectory(Platform::WinWiden(AppDataPath).c_str());
 	shellLink->SetDescription(L"The Powder Toy");
 	if (shellLink->QueryInterface(IID_IPersistFile, (LPVOID *)&shellLinkPersist) != S_OK)
 		goto finalise;