@@ -24,7 +24,7 @@ Item {
2424
2525 readonly property real searchesHeight: recentSearchesRepeater.count > 0 ? searchColumn.height + recentSearchesLabels.height + recentSearchesLabels.anchors.topMargin : 0
2626
27− implicitHeight: searchesHeight + dashNavigation.implicitHeight + dashNavigation.anchors.topMargin + primaryFilter.height + primaryFilter.anchors.topMargin
27+ implicitHeight: searchesHeight + dashNavigation.implicitHeight + dashNavigation.anchors.topMargin + primaryFilterContainer.height + primaryFilterContainer.anchors.topMargin
2828
2929 // Set by parent
3030 property ListModel searchHistory
@@ -124,7 +124,7 @@ Item {
124124 color: "#888888"
125125 }
126126
127− divider.visible: index != recentSearchesRepeater.count - 1 || (scope && scope.hasNavigation) || primaryFilter.active
127+ divider.visible: index != recentSearchesRepeater.count - 1 || (scope && scope.hasNavigation) || primaryFilterContainer.primaryFilter.active
128128
129129 onClicked: root.historyItemClicked(query)
130130 }
@@ -145,22 +145,37 @@ Item {
145145 onLeafClicked: root.dashNavigationLeafClicked();
146146 }
147147
148− Filters.FilterWidgetFactory {
149− id: primaryFilter
150− active: scope && !scope.hasNavigation
148+ Flickable {
149+ id: primaryFilterContainer
151150
152− property var filter: active ? scope.primaryNavigationFilter : null
151+ height: dashNavigation.availableHeight
153152
154153 anchors {
155154 top: recentSearchesRepeater.count > 0 ? searchColumn.bottom : parent.top
156− topMargin: active && recentSearchesRepeater.count > 0 ? units.gu(2) : 0
155+ topMargin: primaryFilter.active && recentSearchesRepeater.count > 0 ? units.gu(2) : 0
157156 left: parent.left
158157 right: parent.right
159158 }
160159
161− widgetId: filter ? filter.filterId : ""
162− widgetType: filter ? filter.filterType : -1
163− widgetData: filter
160+ Filters.FilterWidgetFactory {
161+ id: primaryFilter
162+ active: scope && !scope.hasNavigation
163+
164+ anchors.fill: parent
165+ property var filter: active ? scope.primaryNavigationFilter : null
166+
167+ widgetId: filter ? filter.filterId : ""
168+ widgetType: filter ? filter.filterType : -1
169+ widgetData: filter
170+
171+ MouseArea {
172+ anchors.fill: parent
173+ onClicked: {
174+ propagateComposedEvents = true
175+ mouse.accepted = false
176+ }
177+ }
178+ }
164179 }
165180
166181 // This is outside the item