diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php
index 9149ef5f87..9cd0e1f33e 100644
--- a/pandora_console/godmode/alerts/alert_list.list.php
+++ b/pandora_console/godmode/alerts/alert_list.list.php
@@ -688,7 +688,7 @@ foreach ($simple_alerts as $alert) {
         $data[3] .= '</tr>';
     }
 
-    $data[3] .= '<div id="update_action-div" class="invisible">';
+    $data[3] .= '<div id="update_action-div-'.$alert['id'].'" class="invisible">';
     $data[3] .= '</div>';
     $data[3] .= '</table>';
     // Is possible manage actions if have LW permissions in the agent group of the alert module
@@ -706,9 +706,9 @@ foreach ($simple_alerts as $alert) {
             $actions = alerts_get_alert_actions_filter(true, 'id_group IN ('.$filter_groups.')');
         }
 
-        $data[3] .= '<div id="add_action-div-'.$alert['id'].'" class="invisible left">';
-            $data[3] .= '<form id="add_action_form-'.$alert['id'].'" method="post">';
-                $data[3] .= '<table class="databox_color w100p bg_color222">';
+        $data[3] .= '<div id="add_action-div-'.$alert['id'].'" class="invisible">';
+            $data[3] .= '<form id="add_action_form-'.$alert['id'].'" method="post" style="height:85%;">';
+                $data[3] .= '<table class="databox_color w100p bg_color222" style="height:100%;">';
                     $data[3] .= html_print_input_hidden('add_action', 1, true);
                     $data[3] .= html_print_input_hidden('id_alert_module', $alert['id'], true);
 
@@ -1127,13 +1127,14 @@ function show_add_action(id_alert) {
                 background: "black"
             },
             open: function() {
+                $(`#add_action-div-${id_alert}`).css('overflow', 'hidden');
                 $("#action_select, #action_select").select2({
                     tags: true,
                     dropdownParent: $("#add_action-div-" + id_alert)
                 });
             },
-            width: 500,
-            height: 300
+            width: 455,
+            height: 500
         })
         .show ();
 }
@@ -1151,8 +1152,8 @@ function show_display_update_action(id_module_action, alert_id, alert_id_agent_m
         type: 'POST',
         url: action="<?php echo ui_get_full_url('ajax.php', false, false, false); ?>",
         success: function (data) {
-            $("#update_action-div").html (data);
-            $("#update_action-div").hide ()
+            $(`#update_action-div-${alert_id}`).html (data);
+            $(`#update_action-div-${alert_id}`).hide ()
                 .dialog ({
                     resizable: true,
                     draggable: true,
@@ -1163,14 +1164,14 @@ function show_display_update_action(id_module_action, alert_id, alert_id_agent_m
                         background: "black"
                     },
                     open: function() {
-                        $('#update_action-div').css('overflow', 'hidden'); 
-                        $("#action_select, #action_select_ajax").select2({
+                        $(`#update_action-div-${alert_id}`).css('overflow', 'hidden');
+                        $(`#action_select_ajax-${alert_id}`).select2({
                             tags: true,
-                            dropdownParent: $('#update_action-')
+                            dropdownParent: $(`#update_action-div-${alert_id}`)
                         });
                     },
                     width: 455,
-                    height: 370
+                    height: 500
                 })
                 .show ();
         }
diff --git a/pandora_console/godmode/alerts/alert_list.php b/pandora_console/godmode/alerts/alert_list.php
index 36db141b02..14d9bf10d4 100644
--- a/pandora_console/godmode/alerts/alert_list.php
+++ b/pandora_console/godmode/alerts/alert_list.php
@@ -270,7 +270,8 @@ if ($add_action) {
 }
 
 if ($update_action) {
-    $id_action = (int) get_parameter('action_select_ajax');
+    $alert_id = (int) get_parameter('alert_id');
+    $id_action = (int) get_parameter('action_select_ajax-'.$alert_id);
     $id_module_action = (int) get_parameter('id_module_action_ajax');
     $fires_min = (int) get_parameter('fires_min_ajax');
     $fires_max = (int) get_parameter('fires_max_ajax');
diff --git a/pandora_console/include/ajax/alert_list.ajax.php b/pandora_console/include/ajax/alert_list.ajax.php
index bb3f19a652..4ecc2c0895 100644
--- a/pandora_console/include/ajax/alert_list.ajax.php
+++ b/pandora_console/include/ajax/alert_list.ajax.php
@@ -422,13 +422,18 @@ if ($show_update_action_menu) {
         $id_action
     );
 
-    $data .= '<form id="update_action-'.$alert['id'].'" method="post" style="height:85%;">';
+    $data .= '<form id="update_action-'.$id_alert.'" method="post" style="height:85%;">';
     $data .= '<table class="databox_color w100p bg_color222" style="height:100%;">';
         $data .= html_print_input_hidden(
             'update_action',
             1,
             true
         );
+        $data .= html_print_input_hidden(
+            'alert_id',
+            $id_alert,
+            true
+        );
         $data .= html_print_input_hidden(
             'id_module_action_ajax',
             $id_action,
@@ -478,7 +483,7 @@ if ($show_update_action_menu) {
             $data .= '<td class="datos2">';
                 $data .= html_print_select(
                     $actions,
-                    'action_select_ajax',
+                    'action_select_ajax-'.$id_alert,
                     $action_option['id_alert_action'],
                     '',
                     false,
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index ac6555d9e3..496f57ea1c 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -3279,13 +3279,6 @@ td.empty_field {
   width: 96%;
 }
 
-#update_action-
-  > .select2-container--default
-  .select2-results
-  > .select2-results__options {
-  max-height: 125px !important;
-}
-
 /* Policies styles */
 
 table#policy_modules td * {