diff --git a/dist/windows/clementine.nsi.in b/dist/windows/clementine.nsi.in
index cd783f4df..0cc6d8846 100644
--- a/dist/windows/clementine.nsi.in
+++ b/dist/windows/clementine.nsi.in
@@ -32,7 +32,9 @@ SetCompressor /SOLID lzma
 !define MUI_ICON "clementine.ico"
 
 !define MUI_COMPONENTSPAGE_SMALLDESC
-!define MUI_FINISHPAGE_RUN $INSTDIR/clementine.exe
+!define MUI_FINISHPAGE_RUN
+!define MUI_FINISHPAGE_RUN_TEXT "Run Clementine"
+!define MUI_FINISHPAGE_RUN_FUNCTION "RunClementine"
 
 ; Installer pages
 !insertmacro MUI_PAGE_WELCOME
@@ -54,6 +56,10 @@ ShowInstDetails show
 ShowUnInstDetails show
 RequestExecutionLevel admin
 
+Function RunClementine
+  ShellExecAsUser::ShellExecAsUser "" "$INSTDIR/clementine.exe"
+FunctionEnd
+
 Section "Delete old files" oldfiles
   ; Delete files from older versions
   ; 0.3