diff --git a/install-dev/controllers/http/configure.php b/install-dev/controllers/http/configure.php
index 2aff04ca3..93874ef0c 100644
--- a/install-dev/controllers/http/configure.php
+++ b/install-dev/controllers/http/configure.php
@@ -262,6 +262,35 @@ class InstallControllerHttpConfigure extends InstallControllerHttp
 		sort($list_activities);
 		$this->list_activities = $list_activities;
 
+		// Countries list
+		$this->list_countries = array();
+		$countries = $this->language->getCountries();
+		$top_countries = array(
+			'fr',
+			'es',
+			'us',
+			'gb',
+			'it',
+			'de',
+			'nl',
+			'pl',
+			'id',
+			'be',
+			'br',
+			'se',
+			'ca',
+			'ru',
+			'cn',
+		);
+
+		foreach ($top_countries as $iso)
+			$this->list_countries[$iso] = $countries[$iso];
+		$this->list_countries[0] = '-----------------';
+
+		foreach ($countries as $iso => $lang)
+			$this->list_countries[$iso] = $lang;
+
+
 		// Install type
 		$this->install_type = ($this->session->install_type) ? $this->session->install_type : 'full';
 
diff --git a/install-dev/theme/views/configure.phtml b/install-dev/theme/views/configure.phtml
index f84df265f..12fe5db2c 100644
--- a/install-dev/theme/views/configure.phtml
+++ b/install-dev/theme/views/configure.phtml
@@ -56,8 +56,8 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
 		<div class="contentinput">
 			<select name="shop_country" id="infosCountry">
 				<option value="0">-- <?php echo $this->l('Select your country') ?> --</option>
-				<?php foreach ($this->language->getCountries() as $iso => $country_name): ?>
-					<option value="<?php echo $iso ?>" <?php if ($this->session->shop_country == $iso): ?>selected="selected"<?php endif; ?>><?php echo $country_name ?></option>
+				<?php foreach ($this->list_countries as $iso => $country_name): ?>
+					<option value="<?php echo $iso ?>" <?php if ($this->session->shop_country && $this->session->shop_country == $iso): ?>selected="selected"<?php endif; ?>><?php echo $country_name ?></option>
 				<?php endforeach; ?>
 			</select>
 			<sup class="required">*</sup>