diff --git a/debian/changelog b/debian/changelog
index e3577a4..e18c4bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+raspi-config (20180406) stretch; urgency=medium
+
+  * Set Wi-Fi country while connecting to SSID
+
+ -- Serge Schneider <serge@raspberrypi.org>  Fri, 06 Apr 2018 13:40:21 +0100
+
 raspi-config (20180228) stretch; urgency=medium
 
   * Setting Wi-Fi country no longer requires a reboot
diff --git a/raspi-config b/raspi-config
index 4f8c2a7..d625c25 100755
--- a/raspi-config
+++ b/raspi-config
@@ -1444,6 +1444,10 @@ do_wifi_ssid_passphrase() {
     return 1
   fi
 
+  if [ "$INTERACTIVE" = True ] && [ -z "$(get_wifi_country)" ]; then
+    do_wifi_country
+  fi
+
   SSID="$1"
   while [ -z "$SSID" ] && [ "$INTERACTIVE" = True ]; do
     SSID=$(whiptail --inputbox "Please enter SSID" 20 60 3>&1 1>&2 2>&3)