diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 23f416368a..093308585b 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-13  Vanessa Gil <vanessa.gil@artica.es>
+
+	* godmode/agentes/module_manage_editor_common.php: Disable button
+	'disabled' when a module is linked to a policy.
+
 2012-06-13 Miguel de Dios <miguel.dedios@artica.es>
 	
 	* include/functions_html.php, include/functions_reporting.php,
diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php
index 8ee91e69f2..b947c6b314 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_common.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_common.php
@@ -133,8 +133,13 @@ if (!empty($id_agent_module) && isset($id_agente)) {
 	$table_simple->data[0][1] .= '</a> ';
 }
 
+$disabled_enable = 0;
+$policy_link = db_get_value('id_policy_module', 'tagente_modulo', 'id_agente_modulo', $id_agent_module);
+if ($policy_link != 0) {
+	$disabled_enable = 1;
+}
 $table_simple->data[0][2] = __('Disabled');
-$table_simple->data[0][3] = html_print_checkbox ("disabled", 1, $disabled, true);
+$table_simple->data[0][3] = html_print_checkbox ("disabled", 1, $disabled, true, $disabled_enable);
 
 $table_simple->data[1][0] = __('Type').' ' . ui_print_help_icon ('module_type', true);
 $table_simple->data[1][0] .= html_print_input_hidden ('id_module_type_hidden', $id_module_type, true);