diff --git a/classes/controller/ModuleFrontController.php b/classes/controller/ModuleFrontController.php
index 31184bcb4..f2db4a085 100644
--- a/classes/controller/ModuleFrontController.php
+++ b/classes/controller/ModuleFrontController.php
@@ -55,6 +55,8 @@ class ModuleFrontControllerCore extends FrontController
 	{
 		if (Tools::file_exists_cache(_PS_THEME_DIR_.'modules/'.$this->module->name.'/'.$template))
 			$this->template = _PS_THEME_DIR_.'modules/'.$this->module->name.'/'.$template;
+		elseif (Tools::file_exists_cache(_PS_THEME_DIR_.'modules/'.$this->module->name.'/views/templates/front/'.$template))
+			$this->template = _PS_THEME_DIR_.'modules/'.$this->module->name.'/views/templates/front/'.$template;
 		elseif (Tools::file_exists_cache($this->getTemplatePath().$template))
 			$this->template = $this->getTemplatePath().$template;
 		else
@@ -68,8 +70,6 @@ class ModuleFrontControllerCore extends FrontController
 	 */
 	public function getTemplatePath()
 	{
-		if (file_exists(_PS_THEME_DIR_.'modules/'.$this->module->name.'/views/templates/front/'.$this->template))
-			return _PS_THEME_DIR_.'modules/'.$this->module->name.'/views/templates/front/'.$this->template;
 		return _PS_MODULE_DIR_.$this->module->name.'/views/templates/front/';
 	}
 }