diff --git a/src/State.php b/src/State.php
index 3a17f9d5936..a72ce67b98a 100644
--- a/src/State.php
+++ b/src/State.php
@@ -394,10 +394,17 @@ public function rawSearchOptions()
 
         $tab[] = [
             'id'                 => '23',
-            'table'              => $this->getTable(),
-            'field'              => 'is_visible_monitor',
+            'table'              => DropdownVisibility::getTable(),
+            'field'              => 'is_visible',
             'name'               => sprintf(__('%1$s - %2$s'), __('Visibility'), Monitor::getTypeName(Session::getPluralNumber())),
-            'datatype'           => 'bool'
+            'datatype'           => 'bool',
+            'joinparams'         => [
+                'jointype' => 'itemtypeonly',
+                'table'      => $this->getTable(),
+                'condition' => [
+                    'NEWTABLE.visible_itemtype' => 'Monitor'
+                ]
+            ]
         ];
 
         $tab[] = [