diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php
index 14b66eda3c..4ac5fd265d 100644
--- a/pandora_console/godmode/menu.php
+++ b/pandora_console/godmode/menu.php
@@ -320,7 +320,7 @@ if (check_acl($config['id_user'], 0, 'PM')) {
     $sub2['godmode/setup/setup&section=websocket_engine']['refr'] = 0;
 
     if ($config['activate_gis']) {
-        $sub2['godmode/setup/gis']['text'] = __('Map conections GIS');
+        $sub2['godmode/setup/setup&section=gis']['text'] = __('Map conections GIS');
     }
 
     $sub['general']['sub2'] = $sub2;
diff --git a/pandora_console/godmode/setup/gis.php b/pandora_console/godmode/setup/gis.php
index 526abc0b0a..43e6ed71fd 100755
--- a/pandora_console/godmode/setup/gis.php
+++ b/pandora_console/godmode/setup/gis.php
@@ -28,15 +28,6 @@ require_once 'include/functions_gis.php';
 
 ui_require_javascript_file('openlayers.pandora');
 
-// Header.
-ui_print_page_header(
-    __('Map conections GIS'),
-    '',
-    false,
-    '',
-    true
-);
-
 $action = get_parameter('action');
 
 switch ($action) {
@@ -88,7 +79,7 @@ if ($mapsConnections !== false) {
         $table->data[] = [
             '<a href="index.php?sec=gsetup&sec2=godmode/setup/gis_step_2&amp;action=edit_connection_map&amp;id_connection_map='.$mapsConnection['id_tmap_connection'].'">'.$mapsConnection['conection_name'].'</a>',
             ui_print_group_icon($mapsConnection['group_id'], true),
-            '<a href="index.php?sec=gsetup&sec2=godmode/setup/gis&amp;id_connection_map='.$mapsConnection['id_tmap_connection'].'&amp;action=delete_connection"
+            '<a href="index.php?sec=gsetup&sec2=godmode/setup/setup&amp;section=gis&amp;id_connection_map='.$mapsConnection['id_tmap_connection'].'&amp;action=delete_connection"
 				onClick="javascript: if (!confirm(\''.__('Do you wan delete this connection?').'\')) return false;">'.html_print_image('images/cross.png', true).'</a>',
         ];
         $table->cellclass[][2] = 'action_buttons';
diff --git a/pandora_console/godmode/setup/gis_step_2.php b/pandora_console/godmode/setup/gis_step_2.php
index 133b4fdeaa..001baed40f 100644
--- a/pandora_console/godmode/setup/gis_step_2.php
+++ b/pandora_console/godmode/setup/gis_step_2.php
@@ -26,6 +26,10 @@ if (! check_acl($config['id_user'], 0, 'PM') && ! is_user_admin($config['id_user
 
 require_once 'include/functions_gis.php';
 
+$buttons['gis'] = [
+    'text' => '<a href="'.ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=gis').'">'.html_print_image('images/list.png', true, ['title' => __('GIS Maps connections')]).'</a>',
+];
+
 $action = get_parameter('action', 'create_connection_map');
 
 if (is_ajax()) {
@@ -41,7 +45,8 @@ switch ($action) {
             '',
             false,
             '',
-            true
+            true,
+            $buttons
         );
 
         $mapConnection_name = '';
@@ -67,7 +72,8 @@ switch ($action) {
             '',
             false,
             '',
-            true
+            true,
+            $buttons
         );
 
         $idConnectionMap = get_parameter('id_connection_map');
diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php
index e9b8160fdd..a5f41ed999 100644
--- a/pandora_console/godmode/setup/setup.php
+++ b/pandora_console/godmode/setup/setup.php
@@ -138,6 +138,13 @@ $buttons['websocket_engine'] = [
     'text'   => '<a href="'.ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/setup&section=websocket_engine').'">'.html_print_image('images/websocket_small.png', true, ['title' => __('Websocket engine')]).'</a>',
 ];
 
+if ($config['activate_gis']) {
+    $buttons['gis'] = [
+        'active' => false,
+        'text'   => '<a href="'.ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=gis').'">'.html_print_image('images/gis_tab.png', true, ['title' => __('GIS Map connection')]).'</a>',
+    ];
+}
+
 $help_header = '';
 if (enterprise_installed()) {
     $subpage = setup_enterprise_add_subsection_main($section, $buttons, $help_header);
@@ -183,6 +190,11 @@ switch ($section) {
         $help_header = 'setup_integria_tab';
     break;
 
+    case 'gis':
+        $buttons['gis']['active'] = true;
+        $subpage = ' &raquo '.__('Map conections GIS');
+    break;
+
     case 'notifications':
         $buttons['notifications']['active'] = true;
         $subpage = ' &raquo '.__('Notifications');
@@ -254,6 +266,10 @@ switch ($section) {
         include_once $config['homedir'].'/godmode/setup/setup_integria.php';
     break;
 
+    case 'gis':
+        include_once $config['homedir'].'/godmode/setup/gis.php';
+    break;
+
     case 'notifications':
         include_once $config['homedir'].'/godmode/setup/setup_notifications.php';
     break;