diff --git a/scripts/reconfigure_birdnet_gui.sh b/scripts/reconfigure_birdnet_gui.sh
index aaa6f1c..ca2e850 100755
--- a/scripts/reconfigure_birdnet_gui.sh
+++ b/scripts/reconfigure_birdnet_gui.sh
@@ -51,4 +51,4 @@ fi
 
 ${birdnetpi_dir}/scripts/update_birdnet.sh
 xdg-open http://birdnetpi.local
-systemctl --user disable birdnet-pi-config-gui
+systemctl --user disable birdnet-pi-welcome-wizard.service
diff --git a/scripts/welcome_wizard.sh b/scripts/welcome_wizard.sh
index bfeef7b..51f87e2 100755
--- a/scripts/welcome_wizard.sh
+++ b/scripts/welcome_wizard.sh
@@ -91,10 +91,19 @@ get_date_and_time() {
 }
 
 setup_wifi() {
-  zenity --title="Connect to WiFi" --window-icon=/usr/share/pixmaps/red-cardinal32.png --info --text="Use the Networking Icon in the top right corner of
+  sudo systemctl start dhcpcd
+  wifi_list=""
+  until [[ "${wifi_list}" == "Continue" ]];do
+  wifi_list="$(zenity --title="Connect to WiFi" --extra-button="Refresh WiFi List" --window-icon=/usr/share/pixmaps/red-cardinal32.png --info --text="Use the Networking Icon in the bottom right corner of
 the screen to select your WiFi network. Enter the credentials to connect when prompted.
 
-Press \"Continue\" after you have connected." --ok-label="Continue" --no-wrap
+Press \"Continue\" AFTER you have connected." --ok-label="Continue" --no-wrap)"
+  [ -z ${wifi_list} ] && break
+  if [[ "${wifi_list}" == "Refresh WiFi List" ]];then
+    sudo systemctl restart dhcpcd
+  fi
+done
+
   get_latitude
 }