diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index c0d88ac1a..64dd7eaee 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -1917,6 +1917,14 @@ class AdminControllerCore extends Controller
 		
 		$this->helper = $helper;
 	}
+	
+	public function setDeprecatedMedia()
+	{
+		$admin_webpath = str_ireplace(_PS_ROOT_DIR_, '', _PS_ADMIN_DIR_);
+		$admin_webpath = preg_replace('/^'.preg_quote(DIRECTORY_SEPARATOR, '/').'/', '', $admin_webpath);
+		$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/backward-admin-bootstrap-reset.css', 'all');
+		$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/backward-admin-old.css', 'all');
+	}
 
 	public function setMedia()
 	{
@@ -1927,14 +1935,10 @@ class AdminControllerCore extends Controller
 		$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/admin-theme.css', 'all');
 
 		// Deprecated stylesheets + reset bootstrap style for the #nobootstrap field - Backward compatibility
-		//if (!$this->bootstrap)
-		//{
-			$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/backward-admin-bootstrap-reset.css', 'all');
-			$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/backward-admin-old.css', 'all');
-			
-		//}
+		if (!$this->bootstrap)
+			$this->setDeprecatedMedia();
 		
-		//todo csss for rtl support
+		//todo css for rtl support
 		if ($this->context->language->is_rtl)
 			$this->addCSS(_THEME_CSS_DIR_.'rtl.css');
 
diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php
index 9ef2ab135..398ff4a7c 100644
--- a/controllers/admin/AdminModulesController.php
+++ b/controllers/admin/AdminModulesController.php
@@ -694,6 +694,8 @@ class AdminModulesControllerCore extends AdminController
 						if ($key == 'configure' && Module::isInstalled($module->name))
 						{
 							$this->bootstrap = (isset($module->bootstrap) && $module->bootstrap);
+							if (!$this->bootstrap)
+								$this->setDeprecatedMedia();
 							if (isset($module->multishop_context))
 								$this->multishop_context = $module->multishop_context;
 
diff --git a/modules/gapi/gapi.php b/modules/gapi/gapi.php
index 42e12d10f..a5d2f8994 100644
--- a/modules/gapi/gapi.php
+++ b/modules/gapi/gapi.php
@@ -36,6 +36,7 @@ class Gapi extends Module
 		$this->version = 0.9;
 		$this->author = 'PrestaShop';
 		$this->need_instance = 0;
+		$this->bootstrap = true;
 
 		parent::__construct();