diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins
index 28e8401..cb720ed 100644
--- a/CLIENT_DATA/setup3264.ins
+++ b/CLIENT_DATA/setup3264.ins
@@ -162,6 +162,9 @@ copy "$IniCfgFile$" "$InstallDir64$"
 ; 	icon_file: <path to icon file>
 ; 	icon_index: 2
 ; end_link
+set_basefolder common_desktopdirectory
+set_subfolder ""
+delete_element VistaSwitcher
 
 [Sub_check_exitcode]
 comment "Test for installation success via exit code"