diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js
index 7d3021bfd2..26e34f80aa 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.js
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js
@@ -1543,8 +1543,13 @@ function loadFieldsFromDB(item) {
 					$("select[name=parent]").val(val);
 				if (key == 'linked_layout_status_type')
 					$("select[name=linked_map_status_calculation_type]").val(val).change();
-				if (key == 'id_layout_linked')
-					$("select[name=map_linked]").val(val).change();
+				if (key == 'id_layout_linked') {
+					if (data['linked_layout_node_id'] == null)
+						$("select[name=map_linked]").val(val).change();
+					else
+						$("select[name=map_linked] > option[data-node-id=" + data['linked_layout_node_id'] + "][value=" + val + "]")
+							.prop("selected", true).change();
+				}
 				if (key == 'linked_layout_node_id')
 					$("input[name=linked_map_node_id]").val(val);
 				if (key == 'id_layout_linked_weight')
diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php
index d472542390..690aa437b8 100755
--- a/pandora_console/include/ajax/visual_console_builder.ajax.php
+++ b/pandora_console/include/ajax/visual_console_builder.ajax.php
@@ -615,8 +615,8 @@ switch ($action) {
 						$values['id_agent'] = $id_agent;
 					}
 
-					if ($linked_map_node_id) {
-						$values['linked_layout_node_id'] = $linked_map_node_id;
+					if ($linked_map_node_id !== null) {
+						$values['linked_layout_node_id'] = (int) $linked_map_node_id;
 					}
 				}
 				else if ($id_agent == 0) {