diff --git a/pandora_console/godmode/modules/manage_block_templates.php b/pandora_console/godmode/modules/manage_block_templates.php
index c9f55c14c2..3a93d975b0 100644
--- a/pandora_console/godmode/modules/manage_block_templates.php
+++ b/pandora_console/godmode/modules/manage_block_templates.php
@@ -73,10 +73,13 @@ if (is_ajax()) {
     $manageBlock->run();
     // Get the id_np.
     $id_np = $manageBlock->getIdNp();
+    $saveData = $manageBlock->getSaveData();
 
-    // Show the proper window.
-    if ($id_np === -1) {
-        // List all Module Block.
+    if ($saveData === true) {
+        // Save the data sent
+        $manageBlock->saveData();
+    } else if ($id_np === -1) {
+        // List all Module Blocks.
         $manageBlock->moduleBlockList();
     } else {
         // Create new o update Template.
@@ -88,7 +91,7 @@ if (is_ajax()) {
 <script>
     $(document).ready (function () {
         //Close button
-        $("[id*=checkbox-active]").click (function () {
+        $("[id*=checkbox-switch]").click (function () {
             $("[id*=checkbox-block_id]").toggleClass('alpha50');
         });
     });
diff --git a/pandora_console/include/class/ManageBlock.class.php b/pandora_console/include/class/ManageBlock.class.php
index 2eda9d9f56..64731c9949 100644
--- a/pandora_console/include/class/ManageBlock.class.php
+++ b/pandora_console/include/class/ManageBlock.class.php
@@ -120,7 +120,7 @@ class ManageBlock extends HTML
         $this->pen              = get_parameter('pen', '');
         $this->offset           = get_parameter('offset', 0);
         $this->ajaxController   = $ajax_controller;
-
+        $this->saveData         = (bool) get_parameter('save', 0);
         return $this;
     }
 
@@ -184,12 +184,23 @@ class ManageBlock extends HTML
     }
 
 
+    /**
+     * Get the value of if we want save the changes
+     *
+     * @return boolean True if must save the changes
+     */
+    public function getSaveData()
+    {
+        return $this->saveData;
+    }
+
+
     /**
      * Undocumented function
      *
      * @return void
      */
-    private function manageData()
+    private function saveData()
     {
         // if ($)
         $name        = get_parameter('name', '');
@@ -368,6 +379,8 @@ class ManageBlock extends HTML
 
         // Inputs.
         $inputs = [];
+        // Inputs.
+        $rawInputs = '';
 
         $inputs[] = [
             'label'     => __('Name'),
@@ -420,15 +433,6 @@ class ManageBlock extends HTML
 
         $js = '$(\'#text-pen\').tagEditor();';
 
-        $this->printFormAsList(
-            [
-                'form'   => $form,
-                'inputs' => $inputs,
-                'js'     => $js,
-                true
-            ]
-        );
-
         if ($createNewBlock === false) {
             // Get the data.
             $sql = sprintf(
@@ -503,13 +507,13 @@ class ManageBlock extends HTML
                             $data[1] = ui_print_moduletype_icon($module['type'], true);
                             $data[2] = mb_strimwidth(io_safe_output($module['description']), 0, 150, '...');
                             $data[3] = html_print_checkbox_switch_extended('switch_'.$id_group.'_'.$module['component_id'], 1, 0, false, 'switchBlockControl(event)', '', true);
-                            // $data[3] .= html_print_input_hidden();
+
                             array_push($table->data, $data);
                         }
 
                         $content = html_print_table($table, true);
 
-                        ui_toggle($content, $blockTitle, '', '', false);
+                        $rawInputs .= ui_toggle($content, $blockTitle, '', '', false, true);
                     }
                 }
             } else {
@@ -517,6 +521,16 @@ class ManageBlock extends HTML
             }
         }
 
+        $this->printFormAsList(
+            [
+                'form'      => $form,
+                'inputs'    => $inputs,
+                'rawInputs' => $rawInputs,
+                'js'        => $js,
+                true
+            ]
+        );
+
         $javascript = "
             <script>
             function switchBlockControl(e){