diff --git a/config.xml b/config.xml
index c5e449e..464f49b 100644
--- a/config.xml
+++ b/config.xml
@@ -2,7 +2,7 @@
 <module>
 	<name>ps_mainmenu</name>
 	<displayName><![CDATA[Main menu]]></displayName>
-	<version><![CDATA[2.3.5]]></version>
+	<version><![CDATA[2.3.6]]></version>
 	<description><![CDATA[Adds a new menu to the top of your e-commerce website.]]></description>
 	<author><![CDATA[PrestaShop]]></author>
 	<tab><![CDATA[front_office_features]]></tab>
diff --git a/ps_mainmenu.php b/ps_mainmenu.php
index db89d8b..c3ddd9f 100644
--- a/ps_mainmenu.php
+++ b/ps_mainmenu.php
@@ -69,7 +69,7 @@ public function __construct()
     {
         $this->name = 'ps_mainmenu';
         $this->tab = 'front_office_features';
-        $this->version = '2.3.5';
+        $this->version = '2.3.6';
         $this->author = 'PrestaShop';
         $this->imageFiles = null;
 
@@ -1116,8 +1116,7 @@ public function renderForm()
         $helper->allow_employee_form_lang = Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') ? Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') : 0;
         $helper->module = $this;
         $helper->identifier = $this->identifier;
-        $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false) .
-            '&configure=' . $this->name . '&tab_module=' . $this->tab . '&module_name=' . $this->name;
+        $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false, [], ['configure' => $this->name, 'tab_module' => $this->tab, 'module_name' => $this->name]);
         $helper->token = Tools::getAdminTokenLite('AdminModules');
         $helper->tpl_vars = [
             'languages' => $this->context->controller->getLanguages(),
@@ -1200,8 +1199,7 @@ public function renderAddForm()
             $helper->fields_value['updatelink'] = '';
         }
 
-        $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false) .
-            '&configure=' . $this->name . '&tab_module=' . $this->tab . '&module_name=' . $this->name;
+        $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false, [], ['configure' => $this->name, 'tab_module' => $this->tab, 'module_name' => $this->name]);
         $helper->token = Tools::getAdminTokenLite('AdminModules');
         $helper->languages = $this->context->controller->getLanguages();
         $helper->default_form_language = (int) $this->context->language->id;
@@ -1432,7 +1430,7 @@ public function renderList()
         $helper->module = $this;
         $helper->title = $this->trans('Link list', [], 'Modules.Mainmenu.Admin');
         $helper->token = Tools::getAdminTokenLite('AdminModules');
-        $helper->currentIndex = AdminController::$currentIndex . '&configure=' . $this->name;
+        $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', true, [], ['configure' => $this->name, 'tab_module' => $this->tab, 'module_name' => $this->name]);
 
         return $helper->generateList($links, $fields_list);
     }