diff --git a/pandora_console/godmode/events/event_edit_filter.php b/pandora_console/godmode/events/event_edit_filter.php
index d2a8e6bbef..a1c9638a48 100644
--- a/pandora_console/godmode/events/event_edit_filter.php
+++ b/pandora_console/godmode/events/event_edit_filter.php
@@ -778,7 +778,7 @@ $table->data[12][0] = html_print_label_input_block(
 if (!is_metaconsole()) {
     $table->data[12][1] = html_print_label_input_block(
         __('Module search'),
-        '<div class="w100p">'.html_print_autocomplete_modules(
+        '<div class="w100p module-search">'.html_print_autocomplete_modules(
             'module_search',
             $text_module,
             false,
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index f779b7121e..1c6740efff 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -3453,7 +3453,7 @@ function events_page_responses($event)
             __('Update'),
             'status_button',
             false,
-            'event_change_status(\''.$event['similar_ids'].'\','.$event['server_id'].');',
+            'event_change_status("'.$event['similar_ids'].'",'.$event['server_id'].');',
             [
                 'icon' => 'next',
                 'mode' => 'link',
@@ -3484,7 +3484,7 @@ function events_page_responses($event)
             __('Add comment'),
             'comment_button',
             false,
-            '$(\'#link_comments\').trigger(\'click\');',
+            '$("#link_comments").trigger("click");',
             [
                 'icon' => 'next',
                 'mode' => 'link',
@@ -3511,7 +3511,7 @@ function events_page_responses($event)
             __('Delete event'),
             'delete_button',
             false,
-            'if(!confirm(\''.__('Are you sure?').'\')) { return false; } this.form.submit();',
+            'if(!confirm("'.__('Are you sure?').'")) { return false; } this.form.submit();',
             [
                 'icon' => 'cancel',
                 'mode' => 'link',
@@ -4260,7 +4260,7 @@ function events_page_details($event, $server_id=0)
             __('View custom fields'),
             'custom_button',
             false,
-            '$(\'#link_custom_fields\').trigger(\'click\');',
+            '$("#link_custom_fields").trigger("click");',
             [ 'mode' => 'link' ],
             true
         );
@@ -5172,7 +5172,7 @@ function events_page_comments($event, $ajax=false, $groupedComments=[])
             __('Add comment'),
             'comment_button',
             false,
-            'event_comment(\''.base64_encode(json_encode($event)).'\');',
+            'event_comment("'.base64_encode(json_encode($event)).'");',
             [
                 'icon' => 'next',
                 'mode' => 'mini secondary',
@@ -5779,7 +5779,7 @@ function get_row_response_action(
         __('Execute again'),
         'btn_str',
         false,
-        'perform_response(\''.base64_encode(json_encode($event_response)).'\','.$response_id.',\''.trim($index).'\')',
+        'perform_response("'.base64_encode(json_encode($event_response)).'",'.$response_id.',"'.trim($index).'")',
         [
             'icon' => 'next',
             'mode' => 'mini secondary',
diff --git a/pandora_console/include/javascript/pandora_events.js b/pandora_console/include/javascript/pandora_events.js
index 7f7700f6f1..9f40d84305 100644
--- a/pandora_console/include/javascript/pandora_events.js
+++ b/pandora_console/include/javascript/pandora_events.js
@@ -67,7 +67,7 @@ function show_event_dialog(event, dialog_page) {
             background: "black"
           },
           width: 710,
-          height: 600,
+          height: 650,
           autoOpen: true,
           open: function() {
             if (
diff --git a/pandora_console/include/styles/events.css b/pandora_console/include/styles/events.css
index c2a4665925..02611196c4 100644
--- a/pandora_console/include/styles/events.css
+++ b/pandora_console/include/styles/events.css
@@ -173,10 +173,6 @@ fieldset {
   max-width: 10px;
 }
 
-.fixed_filter_bar:has(div > div.filter-datatable-submain > form#events_form) {
-  margin-bottom: 0px;
-}
-
 .fixed_filter_bar > div.white_table_graph_header:has(div.filter_summary) {
   padding: 5px 20px;
 }
@@ -524,3 +520,7 @@ td#save_filter_form-0-0 > input[type="radio"],
 td#save_filter_form-0-1 > input[type="radio"] {
   height: 14px;
 }
+
+.module-search > input[type="text"] {
+  margin-bottom: 6px;
+}
diff --git a/pandora_console/include/styles/tables.css b/pandora_console/include/styles/tables.css
index af6508027d..c10738b02c 100644
--- a/pandora_console/include/styles/tables.css
+++ b/pandora_console/include/styles/tables.css
@@ -688,7 +688,7 @@ table.events-filters-create
   > div
   > div
   > .ui-autocomplete-input {
-  width: 94%;
+  width: 100%;
 }
 
 table.events-filters-create > tbody > tr > td > div.flex-row > div {