diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php
index d43b27699..bc82f8939 100644
--- a/library/Icinga/Web/Widget/FilterEditor.php
+++ b/library/Icinga/Web/Widget/FilterEditor.php
@@ -42,9 +42,11 @@ class FilterEditor extends AbstractWidget
      */
     public function __construct($props)
     {
-        $this->filter = $props['filter'];
+        if (array_key_exists('filter', $props)) {
+            $this->setFilter($props['filter']);
+        }
         if (array_key_exists('query', $props)) {
-            $this->query = $props['query'];
+            $this->setQuery($props['query']);
         }
     }