diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index 23d9de7b5..c0d529d60 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -1940,7 +1940,10 @@ class AdminControllerCore extends Controller
 			$this->context->shop = new Shop(Configuration::get('PS_SHOP_DEFAULT'));
 		elseif ($this->context->shop->id != $shop_id)
 			$this->context->shop = new Shop($shop_id);
-
+		
+		// Replace current default country		
+		$this->context->country = new Country((int)Configuration::get('PS_COUNTRY_DEFAULT'));
+				
 		$this->initBreadcrumbs();
 	}