diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 8b5f1c1c17..b8aac16874 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-09  Vanessa Gil  <vanessa.gil@artica.es>
+	* godmode/agentes/module_manager_editor_common.php: Fixed behavior combo
+	tag selected.
+
 2012-02-09  Vanessa Gil  <vanessa.gil@artica.es>
 	* godmode/events/custom_events.php: Changed combo box update.
 
diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php
index a5c8ee5469..89eb7cd7f0 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_common.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_common.php
@@ -265,6 +265,7 @@ if ($__code_from == 'modules') {
 	$__id_where = 'b.id_policy_module';
 	$__id = $__id_pol_mod;
 }
+
 $table_advanced->data[6][1] = html_print_select_from_sql ("SELECT id_tag, name
 										FROM ttag 
 										WHERE id_tag NOT IN (
@@ -272,7 +273,7 @@ $table_advanced->data[6][1] = html_print_select_from_sql ("SELECT id_tag, name
 											FROM ttag a, $__table_modules b 
 											WHERE a.id_tag = b.id_tag AND $__id_where = $__id )
 											ORDER BY name",
-	'id_tag_available[]', $id_tag, '',__('None'),'0', true, true, false, false, 'width: 200px', '5');
+	'id_tag_available[]', $id_tag, '','','', true, true, false, false, 'width: 200px', '5');
 $table_advanced->data[6][2] =  html_print_image('images/darrowright.png', true, array('id' => 'right', 'title' => __('Add tags to module'))); //html_print_input_image ('add', 'images/darrowright.png', 1, '', true, array ('title' => __('Add tags to module')));
 $table_advanced->data[6][2] .= '<br><br><br><br>' . html_print_image('images/darrowleft.png', true, array('id' => 'left', 'title' => __('Delete tags to module'))); //html_print_input_image ('add', 'images/darrowleft.png', 1, '', true, array ('title' => __('Delete tags to module')));
 	
@@ -281,7 +282,7 @@ $table_advanced->data[6][4] =  html_print_select_from_sql ("SELECT a.id_tag, nam
 										FROM ttag a, $__table_modules b
 										WHERE a.id_tag = b.id_tag AND $__id_where = $__id
 										ORDER BY name",
-	'id_tag_selected[]', $id_tag, '',__('None'),'0', true, true, false, false, 'width: 200px', '5');
+	'id_tag_selected[]', $id_tag, '','','', true, true, false, false, 'width: 200px', '5');
 //$table_advanced->data[6][4] .= html_print_input_hidden('id_tag_serialize', '');
 
 ?>
@@ -294,7 +295,7 @@ $(document).ready (function () {
 			tag_name = $(value).html();
 			if (tag_name != <?php echo "'".__('None')."'"; ?>){
 				id_tag = $(value).attr('value');
-				$("select[name='id_tag_selected[]']").append($("<option selected='selected'>").val(id_tag).html('<i>' + tag_name + '</i>'));
+				$("select[name='id_tag_selected[]']").append($("<option></option>").val(id_tag).html('<i>' + tag_name + '</i>'));
 				$("#id_tag_available").find("option[value='" + id_tag + "']").remove();
 			}
 		});			
@@ -309,6 +310,11 @@ $(document).ready (function () {
 				}
 		});			
 	});
+	$("#submit-updbutton").click(function () {
+		$('#id_tag_selected option').map(function(){
+			$(this).attr('selected','selected');
+		});
+	});
 });
 /* ]]> */
 </script>