diff --git a/app/modules/components/filter/filter.directive.coffee b/app/modules/components/filter/filter.directive.coffee
index 92dca69f..c15eb137 100644
--- a/app/modules/components/filter/filter.directive.coffee
+++ b/app/modules/components/filter/filter.directive.coffee
@@ -19,6 +19,12 @@
 
 FilterDirective = () ->
     link = (scope, el, attrs, ctrl) ->
+        unwatch = scope.$watch "vm.defaultQ", (q) ->
+            if q && !scope.vm.filtersForm.$dirty
+                scope.vm.q = q
+                unwatch()
+            else if scope.vm.filtersForm.$dirty
+                unwatch()
 
     return {
         scope: {
@@ -29,7 +35,7 @@ FilterDirective = () ->
             onRemoveCustomFilter: "&",
             onSaveCustomFilter: "&",
             customFilters: "<",
-            q: "<",
+            defaultQ: "=q",
             filters: "<"
             customFilters: "<"
             selectedFilters: "<"
diff --git a/app/modules/components/filter/filter.jade b/app/modules/components/filter/filter.jade
index db7f53b1..3bb36933 100644
--- a/app/modules/components/filter/filter.jade
+++ b/app/modules/components/filter/filter.jade
@@ -1,7 +1,7 @@
 h1
     span.title(translate="COMMON.FILTERS.TITLE")
 
-form
+form(name="vm.filtersForm")
     fieldset
         input.e2e-filter-q(
             type="text",