diff --git a/builder/startup/deb/select-de.sh b/builder/startup/deb/select-de.sh
old mode 100644
new mode 100755
index b43c264..94a58e1
--- a/builder/startup/deb/select-de.sh
+++ b/builder/startup/deb/select-de.sh
@@ -125,3 +125,19 @@ SCRIPT
 user_asked_to_select_de() {
   [[ "$action" = "select-de-and-start" ]]
 }
+
+debug() {
+  if [ -z "$debug" ]; then return; fi
+
+  echo "$@"
+}
+
+if user_asked_to_select_de || ! de_was_selected_on_previous_run; then
+  detect_desktop_environments
+  ask_user_to_choose_de
+  debug "You selected $de_name desktop environment"
+  if [[ "$de_name" != "$manual_xstartup_choice" ]]; then
+    setup_de_to_run_via_xstartup
+  fi
+  remember_de_choice
+fi
diff --git a/unix/vncserver b/unix/vncserver
index b76e14c..176101f 100644
--- a/unix/vncserver
+++ b/unix/vncserver
@@ -179,6 +179,11 @@ if (!(-e $vncUserDir)) {
     }
 }
 
+$selectDeCmd = "builder/startup/deb/select-de.sh";
+if (!$skipxstartup) {
+   system($selectDeCmd);
+}
+
 # Find display number.
 if ((@ARGV > 0) && ($ARGV[0] =~ /^:(\d+)$/)) {
     $displayNumber = $1;