diff --git a/src/QmlControls/AppMessages.qml b/src/QmlControls/AppMessages.qml
index d6cb59bbbc92cb00b4765ed272eb8d2df5bd64bb..b6717b964d9befb70bdee00c8dd90a01cbda2344 100644
--- a/src/QmlControls/AppMessages.qml
+++ b/src/QmlControls/AppMessages.qml
@@ -29,45 +29,44 @@ Item {
     Component {
         id: filtersDialogComponent
         QGCViewDialog {
-            ColumnLayout {
+            QGCFlickable {
                 anchors.fill: parent
-                RowLayout {
-                    spacing: ScreenTools.defaultFontPixelHeight / 2
-                    Layout.alignment: Qt.AlignVCenter
-                    Layout.fillHeight: true
-                    Layout.fillWidth: true
 
-                    QGCLabel {
-                        text: qsTr("Search:")
-                    }
+                contentHeight:  categoryColumn.height
+                clip:           true
 
-                    QGCTextField {
-                        id: searchText
-                        text: ""
+                ColumnLayout {
+                    anchors.fill: parent
+                    RowLayout {
+                        spacing: ScreenTools.defaultFontPixelHeight / 2
+                        Layout.alignment: Qt.AlignVCenter
+                        Layout.fillHeight: true
                         Layout.fillWidth: true
-                        enabled: true
-                    }
 
-                    QGCButton {
-                        text: qsTr("Clear")
-                        onClicked: searchText.text = ""
-                    }
-                }
+                        QGCLabel {
+                            text: qsTr("Search:")
+                        }
 
-                Row {
-                    spacing:    ScreenTools.defaultFontPixelHeight / 2
-                    QGCButton {
-                        text: qsTr("Clear All")
-                        onClicked: categoryRepeater.setAllLogs(false)
-                    }
-                }
+                        QGCTextField {
+                            id: searchText
+                            text: ""
+                            Layout.fillWidth: true
+                            enabled: true
+                        }
 
-                QGCFlickable {
-                    Layout.fillHeight: true
-                    Layout.fillWidth: true
+                        QGCButton {
+                            text: qsTr("Clear")
+                            onClicked: searchText.text = ""
+                        }
+                    }
 
-                    contentHeight:  categoryColumn.height
-                    clip:           true
+                    Row {
+                        spacing:    ScreenTools.defaultFontPixelHeight / 2
+                        QGCButton {
+                            text: qsTr("Clear All")
+                            onClicked: categoryRepeater.setAllLogs(false)
+                        }
+                    }
 
                     Column {
                         id:         categoryColumn