diff --git a/core/Controller/Admin.php b/core/Controller/Admin.php
index cc827705986e51abeedb15776d88b5bbe6ad7a3c..28be7967137c9ecb0fff7ec69527d331ff24505e 100644
--- a/core/Controller/Admin.php
+++ b/core/Controller/Admin.php
@@ -27,11 +27,15 @@ abstract class Piwik_Controller_Admin extends Piwik_Controller
 	{
 		parent::setBasicVariablesView($view);
 
+		self::setBasicVariablesAdminView($view);
+	}
+
+	static public function setBasicVariablesAdminView($view)
+	{
 		$view->currentAdminMenuName = Piwik_GetCurrentAdminMenuName();
 
 		$view->enableFrames = Piwik_Config::getInstance()->General['enable_framed_settings'];
-		if(!$view->enableFrames)
-		{
+		if (!$view->enableFrames) {
 			$view->setXFrameOptions('sameorigin');
 		}
 	}
diff --git a/plugins/UserCountry/Controller.php b/plugins/UserCountry/Controller.php
index 5953ccbd9e5fb3a90faf9cadcb42f8871bc51cba..a2e2d7495f8eb151da0c6973bfe99009847a99cc 100644
--- a/plugins/UserCountry/Controller.php
+++ b/plugins/UserCountry/Controller.php
@@ -40,8 +40,9 @@ class Piwik_UserCountry_Controller extends Piwik_Controller
 			$newline = '<br/>', $includeExtra = true);
 		$view->currentProviderId = Piwik_UserCountry_LocationProvider::getCurrentProviderId();
 		$view->thisIP = Piwik_IP::getIpFromHeader();
-		
+
 		$this->setBasicVariablesView($view);
+		Piwik_Controller_Admin::setBasicVariablesAdminView($view);
 		$view->menu = Piwik_GetAdminMenu();
 		
 		echo $view->render();