diff --git a/src/QmlControls/AppMessages.qml b/src/QmlControls/AppMessages.qml
index 157ad5b3ec3ee597bfc6728236c14f22d5e40e77..b6717b964d9befb70bdee00c8dd90a01cbda2344 100644
--- a/src/QmlControls/AppMessages.qml
+++ b/src/QmlControls/AppMessages.qml
@@ -11,6 +11,7 @@ import QtQuick                  2.3
 import QtQuick.Controls         1.2
 import QtQuick.Controls.Styles  1.4
 import QtQuick.Dialogs          1.2
+import QtQuick.Layouts          1.12
 
 import QGroundControl               1.0
 import QGroundControl.Palette       1.0
@@ -29,35 +30,71 @@ Item {
         id: filtersDialogComponent
         QGCViewDialog {
             QGCFlickable {
-                anchors.fill:   parent
+                anchors.fill: parent
+
                 contentHeight:  categoryColumn.height
                 clip:           true
-                Column {
-                    id:         categoryColumn
-                    spacing:    ScreenTools.defaultFontPixelHeight / 2
-
-                    QGCButton {
-                        text: qsTr("Clear All")
-                        onClicked: {
-                            var logCats = QGroundControl.loggingCategories()
-                            for (var i=0; i<logCats.length; i++) {
-                                QGroundControl.setCategoryLoggingOn(logCats[i], false)
-                            }
-                            QGroundControl.updateLoggingFilterRules()
-                            categoryRepeater.model = undefined
-                            categoryRepeater.model = QGroundControl.loggingCategories()
+
+                ColumnLayout {
+                    anchors.fill: parent
+                    RowLayout {
+                        spacing: ScreenTools.defaultFontPixelHeight / 2
+                        Layout.alignment: Qt.AlignVCenter
+                        Layout.fillHeight: true
+                        Layout.fillWidth: true
+
+                        QGCLabel {
+                            text: qsTr("Search:")
+                        }
+
+                        QGCTextField {
+                            id: searchText
+                            text: ""
+                            Layout.fillWidth: true
+                            enabled: true
+                        }
+
+                        QGCButton {
+                            text: qsTr("Clear")
+                            onClicked: searchText.text = ""
                         }
                     }
-                    Repeater {
-                        id:     categoryRepeater
-                        model:  QGroundControl.loggingCategories()
-
-                        QGCCheckBox {
-                            text:       modelData
-                            checked:    QGroundControl.categoryLoggingOn(modelData)
-                            onClicked:  {
-                                QGroundControl.setCategoryLoggingOn(modelData, checked)
+
+                    Row {
+                        spacing:    ScreenTools.defaultFontPixelHeight / 2
+                        QGCButton {
+                            text: qsTr("Clear All")
+                            onClicked: categoryRepeater.setAllLogs(false)
+                        }
+                    }
+
+                    Column {
+                        id:         categoryColumn
+                        spacing:    ScreenTools.defaultFontPixelHeight / 2
+
+                        Repeater {
+                            id:     categoryRepeater
+                            model:  QGroundControl.loggingCategories()
+
+                            function setAllLogs(value) {
+                                var logCategories = QGroundControl.loggingCategories()
+                                for (var category of logCategories) {
+                                    QGroundControl.setCategoryLoggingOn(category, value)
+                                }
                                 QGroundControl.updateLoggingFilterRules()
+                                // Update model for repeater
+                                categoryRepeater.model = undefined
+                                categoryRepeater.model = QGroundControl.loggingCategories()
+                            }
+
+                            QGCCheckBox {
+                                text:       modelData
+                                visible:    searchText.text ? text.match(`(${searchText.text})`, "i") : true
+                                checked:    QGroundControl.categoryLoggingOn(modelData)
+                                onClicked:  {
+                                    QGroundControl.setCategoryLoggingOn(modelData, checked)
+                                    QGroundControl.updateLoggingFilterRules()
+                                }
                             }
                         }
                     }