diff --git a/pandora_console/include/class/SnmpConsole.class.php b/pandora_console/include/class/SnmpConsole.class.php
index 9aae307bc5..96553d2ac4 100644
--- a/pandora_console/include/class/SnmpConsole.class.php
+++ b/pandora_console/include/class/SnmpConsole.class.php
@@ -413,73 +413,74 @@ class SnmpConsole extends HTML
                         'class'  => 'flex-row',
                         'inputs' => [
                             [
-                                'label'    => __('Alert'),
-                                'type'     => 'select',
-                                'id'       => 'filter_alert',
-                                'name'     => 'filter_alert',
-                                'class'    => 'w200px',
-                                'fields'   => $show_alerts,
-                                'return'   => true,
-                                'selected' => $this->filter_alert,
+                                'label'       => __('Alert'),
+                                'type'        => 'select',
+                                'id'          => 'filter_alert',
+                                'input_class' => 'filter_input_datatable',
+                                'name'        => 'filter_alert',
+                                'fields'      => $show_alerts,
+                                'return'      => true,
+                                'selected'    => $this->filter_alert,
                             ],
                             [
-                                'label'    => __('Severity'),
-                                'type'     => 'select',
-                                'id'       => 'filter_severity',
-                                'name'     => 'filter_severity',
-                                'class'    => 'w200px',
-                                'fields'   => $severities,
-                                'return'   => true,
-                                'selected' => $this->filter_severity,
+                                'label'       => __('Severity'),
+                                'type'        => 'select',
+                                'id'          => 'filter_severity',
+                                'input_class' => 'filter_input_datatable',
+                                'name'        => 'filter_severity',
+                                'fields'      => $severities,
+                                'return'      => true,
+                                'selected'    => $this->filter_severity,
                             ],
                             [
-                                'label' => __('Free search'),
-                                'type'  => 'text',
-                                'class' => 'w400px',
-                                'id'    => 'filter_free_search',
-                                'name'  => 'filter_free_search',
-                                'value' => $this->filter_free_search,
+                                'label'       => __('Free search'),
+                                'type'        => 'text',
+                                'id'          => 'filter_free_search',
+                                'input_class' => 'filter_input_datatable',
+                                'name'        => 'filter_free_search',
+                                'value'       => $this->filter_free_search,
                             ],
                             [
-                                'label'    => __('Status'),
-                                'type'     => 'select',
-                                'id'       => 'filter_status',
-                                'name'     => 'filter_status',
-                                'class'    => 'w200px',
-                                'fields'   => $status_array,
-                                'return'   => true,
-                                'selected' => $this->filter_status,
+                                'label'       => __('Status'),
+                                'type'        => 'select',
+                                'id'          => 'filter_status',
+                                'input_class' => 'filter_input_datatable',
+                                'name'        => 'filter_status',
+                                'fields'      => $status_array,
+                                'return'      => true,
+                                'selected'    => $this->filter_status,
                             ],
                             [
-                                'label'    => __('Group by Enterprise String/IP'),
-                                'type'     => 'select',
-                                'name'     => 'filter_group_by',
-                                'selected' => $this->filter_group_by,
-                                'disabled' => false,
-                                'return'   => true,
-                                'id'       => 'filter_group_by',
-                                'fields'   => [
+                                'label'       => __('Group by Enterprise String/IP'),
+                                'type'        => 'select',
+                                'name'        => 'filter_group_by',
+                                'selected'    => $this->filter_group_by,
+                                'disabled'    => false,
+                                'return'      => true,
+                                'id'          => 'filter_group_by',
+                                'input_class' => 'filter_input_datatable',
+                                'fields'      => [
                                     0 => __('No'),
                                     1 => __('Yes'),
                                 ],
                             ],
                             [
-                                'label' => __('Max. hours old'),
-                                'type'  => 'text',
-                                'class' => 'w200px',
-                                'id'    => 'filter_hours_ago',
-                                'name'  => 'filter_hours_ago',
-                                'value' => $this->filter_hours_ago,
+                                'label'       => __('Max. hours old'),
+                                'type'        => 'text',
+                                'id'          => 'filter_hours_ago',
+                                'input_class' => 'filter_input_datatable',
+                                'name'        => 'filter_hours_ago',
+                                'value'       => $this->filter_hours_ago,
                             ],
                             [
-                                'label'    => __('Trap type'),
-                                'type'     => 'select',
-                                'id'       => 'filter_trap_type',
-                                'name'     => 'filter_trap_type',
-                                'class'    => 'w200px',
-                                'fields'   => $trap_types,
-                                'return'   => true,
-                                'selected' => $this->filter_trap_type,
+                                'label'       => __('Trap type'),
+                                'type'        => 'select',
+                                'id'          => 'filter_trap_type',
+                                'input_class' => 'filter_input_datatable',
+                                'name'        => 'filter_trap_type',
+                                'fields'      => $trap_types,
+                                'return'      => true,
+                                'selected'    => $this->filter_trap_type,
                             ],
                         ],
                     ],
diff --git a/pandora_console/include/styles/tables.css b/pandora_console/include/styles/tables.css
index 40ecaf11ba..fca924b6e0 100644
--- a/pandora_console/include/styles/tables.css
+++ b/pandora_console/include/styles/tables.css
@@ -323,6 +323,25 @@ a.pandora_pagination.current:hover {
   cursor: default;
 }
 
+.filter_input_datatable {
+  width: 45% !important;
+  display: flex;
+  flex-wrap: nowrap;
+  flex-direction: row;
+  max-width: 450px;
+  min-width: 400px;
+}
+.filter_input_datatable input {
+  flex: 1;
+}
+.filter_input_datatable label {
+  width: 93px;
+  max-width: 100%;
+}
+.filter_input_datatable .select2.select2-container {
+  flex: 1;
+}
+
 /* Default datatable filter style */
 .datatable_filter.content {
   display: flex;
@@ -336,7 +355,8 @@ a.pandora_pagination.current:hover {
 }
 .datatable_filter.content li {
   flex: 1 1 auto;
-  margin: 1em auto;
+  margin: 1em 0;
+  padding: 0px 10px;
 }
 .sorting_desc {
   background: url(../../images/sort_down_green.png) no-repeat;