diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index eb45e734dd..143483a8fd 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-23  Junichi Satoh  <junichi@rworks.jp>
+
+	* godmode/alert/alert_list.php, godmode/alert/alert_list.list.php:
+	Added 'Enabled/Disabled' selection to alert filter.
+
 2010-08-23  Junichi Satoh  <junichi@rworks.jp>
 
 	* godmode/alert/alert_compounds.php: Fixed the problem alert compounds
diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php
index 8100ec3caf..8ceb27b5bb 100644
--- a/pandora_console/godmode/alerts/alert_list.list.php
+++ b/pandora_console/godmode/alerts/alert_list.list.php
@@ -86,6 +86,14 @@ echo "<div id='alert_control' style='display:none'>\n";
 	echo "</td>";
 	echo "</tr>\n";
 	
+	echo "<tr>\n";
+	echo "<td>".__('Enabled / Disabled')."</td><td>";
+	$ed_list = array ();
+	$ed_list[0] = __('Enable');
+	$ed_list[1] = __('Disable');
+	print_select ($ed_list, 'enabledisable', $enabledisable, '', __('All'), -1);
+	echo "</td></tr>\n";
+
 	echo "<tr>\n";
 	echo "<td colspan='6' align='right'>";
 	print_submit_button (__('Update'), '', false, 'class="sub upd"');
@@ -123,6 +131,8 @@ if ($searchFlag) {
 			WHERE t1.nombre LIKE '" . trim($agentName) . "')";
 	if ($actionID != -1)
 		$where .= " AND id IN (SELECT id_alert_template_module FROM talert_template_module_actions WHERE id_alert_action = " . $actionID . ")";
+	if ($enabledisable != -1)
+		$where .= " AND talert_template_modules.disabled =" . $enabledisable;
 }
 
 $total = get_agent_alerts_simple (array_keys ($agents), false,
diff --git a/pandora_console/godmode/alerts/alert_list.php b/pandora_console/godmode/alerts/alert_list.php
index ea4aff3cf5..45a21b382a 100644
--- a/pandora_console/godmode/alerts/alert_list.php
+++ b/pandora_console/godmode/alerts/alert_list.php
@@ -55,6 +55,7 @@ $fieldContent = get_parameter('field_content','');
 $searchType = get_parameter('search_type','');
 $priority = get_parameter('priority','');
 $searchFlag = get_parameter('search',0);
+$enabledisable = get_parameter('enabledisable','');
 
 $messageAction = '';