diff --git a/pandora_console/include/javascript/graph_analytics.js b/pandora_console/include/javascript/graph_analytics.js
index 475a310ebc..5a83c7c88f 100644
--- a/pandora_console/include/javascript/graph_analytics.js
+++ b/pandora_console/include/javascript/graph_analytics.js
@@ -253,30 +253,35 @@ function createDroppableZones(
               )
             );
 
-            // Create remove button.
             if (
-              graphDiv
-                .children()
-                .children()
-                .hasClass("parent_graph") === true
+              $("#hidden-section").val() ===
+              "operation/reporting/graph_analytics"
             ) {
-              graphDiv
-                .children()
-                .children()
-                .children(":first-child")
-                .prepend(
-                  $(
-                    '<img src="images/delete.svg" class="remove-graph-analytics" onclick="removeGraph(this);">'
-                  )
-                );
-            } else {
-              graphDiv
-                .children()
-                .append(
-                  $(
-                    '<img src="images/delete.svg" class="remove-graph-analytics" onclick="removeGraph(this);">'
-                  )
-                );
+              // Create remove button.
+              if (
+                graphDiv
+                  .children()
+                  .children()
+                  .hasClass("parent_graph") === true
+              ) {
+                graphDiv
+                  .children()
+                  .children()
+                  .children(":first-child")
+                  .prepend(
+                    $(
+                      '<img src="images/delete.svg" class="remove-graph-analytics" onclick="removeGraph(this);">'
+                    )
+                  );
+              } else {
+                graphDiv
+                  .children()
+                  .append(
+                    $(
+                      '<img src="images/delete.svg" class="remove-graph-analytics" onclick="removeGraph(this);">'
+                    )
+                  );
+              }
             }
           }
         }
@@ -753,7 +758,7 @@ $("#button-share-modal").click(function(e) {
 
   window.open(
     configHomeurl +
-      "/operation/reporting/graph_analytics_public.php?" +
+      "operation/reporting/graph_analytics_public.php?" +
       queryParams
   );
 });
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index b94418b090..2b347fd81a 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -1945,7 +1945,7 @@ div.title_line {
 #menu_tab_frame_view_bc {
   position: sticky;
   top: 61px;
-  z-index: 2;
+  z-index: 3;
   display: flex;
   align-items: flex-end;
   justify-content: space-between;
@@ -13517,6 +13517,10 @@ tr.shown td.details-control {
   -webkit-mask: url(../../images/minimizar.svg) no-repeat right / contain;
 }
 
+#modules-toggle > .modules > .white-box-content div {
+  z-index: 1 !important;
+}
+
 /* Import/export */
 .div-import-export {
   display: flex;
@@ -13584,3 +13588,7 @@ button.disabled {
   background: #c0ccdc !important;
   border: 0px;
 }
+
+.ui-draggable-handle {
+  z-index: 2 !important;
+}
diff --git a/pandora_console/operation/reporting/graph_analytics.php b/pandora_console/operation/reporting/graph_analytics.php
index ff6272bdd6..3a118c6943 100644
--- a/pandora_console/operation/reporting/graph_analytics.php
+++ b/pandora_console/operation/reporting/graph_analytics.php
@@ -811,6 +811,7 @@ ui_print_standard_header(
         $tab_new,
         $tab_pause_realtime,
         $tab_start_realtime,
+        html_print_input_hidden('section', get_parameter('sec2'), true),
     ],
     [
         [
@@ -885,7 +886,7 @@ $left_content .= '
     'modules-toggle',
     true,
     true,
-    '',
+    'modules',
     'white-box-content',
     'box-flat white_table_graph',
     'images/arrow@svg.svg',