diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 555d9b8b44..4c90d901dd 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2011-04-20 Javier Lanz <javier.lanz@artica.es>
+
+	* godmode/alerts/configure_alert_action.php: Fixed a small bug about
+	entities on "Command preview"
+
+	Fix: #3276373
+
 2011-04-20 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
 
 	* include/functions_graph.php: Fixed some mistakes of my last commit.
diff --git a/pandora_console/godmode/alerts/configure_alert_action.php b/pandora_console/godmode/alerts/configure_alert_action.php
index 7328447fb7..b6c57bda3c 100644
--- a/pandora_console/godmode/alerts/configure_alert_action.php
+++ b/pandora_console/godmode/alerts/configure_alert_action.php
@@ -152,7 +152,10 @@ ui_require_javascript_file ('pandora_alerts');
 <script type="text/javascript">
 $(document).ready (function () {
 <?php if ($id_command) : ?>
-	original_command = "<?php echo alerts_get_alert_command_command ($id_command); ?>";
+	original_command = "<?php $command = get_alert_command_command ($id_command);
+								$command = safe_output($command);
+								echo addslashes($command);
+		?>";
 	render_command_preview ();
 <?php endif; ?>
 	$("#id_command").change (function () {