diff --git a/kcmkwin/kwineffects/package/contents/ui/main.qml b/kcmkwin/kwineffects/package/contents/ui/main.qml
index d0ce35a70..53568c2e6 100644
--- a/kcmkwin/kwineffects/package/contents/ui/main.qml
+++ b/kcmkwin/kwineffects/package/contents/ui/main.qml
@@ -1,154 +1,151 @@
 /*
  * Copyright (C) 2013 Antonis Tsiapaliokas <kok3rs@gmail.com>
  * Copyright (C) 2019 Vlad Zagorodniy <vladzzag@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 import QtQuick 2.1
 import QtQuick.Controls 2.5 as QtControls
 import QtQuick.Layouts 1.1
 import org.kde.kcm 1.2
 import org.kde.kconfig 1.0
-import org.kde.kirigami 2.5 as Kirigami
+import org.kde.kirigami 2.8 as Kirigami
 import org.kde.private.kcms.kwin.effects 1.0 as Private
 
 ScrollViewKCM {
     ConfigModule.quickHelp: i18n("This module lets you configure desktop effects.")
 
     header: ColumnLayout {
         QtControls.Label {
             Layout.fillWidth: true
 
             elide: Text.ElideRight
             text: i18n("Hint: To find out or configure how to activate an effect, look at the effect's settings.")
         }
 
         RowLayout {
-            QtControls.TextField {
+            Kirigami.SearchField {
                 id: searchField
 
                 Layout.fillWidth: true
-
-                // TODO: Needs clear button, missing in Qt.
-                placeholderText: i18n("Search...")
             }
 
             QtControls.Button {
                 id: configureButton
 
                 QtControls.ToolTip.visible: hovered
                 QtControls.ToolTip.text: i18n("Configure filter")
 
                 icon.name: "configure"
 
                 onClicked: menu.opened ? menu.close() : menu.open()
             }
 
             QtControls.Menu {
                 id: menu
 
                 x: parent.width - width
                 y: configureButton.height
 
                 QtControls.MenuItem {
                     checkable: true
                     checked: searchModel.excludeUnsupported
                     text: i18n("Exclude Desktop Effects not supported by the Compositor")
 
                     onToggled: searchModel.excludeUnsupported = checked
                 }
 
                 QtControls.MenuItem {
                     checkable: true
                     checked: searchModel.excludeInternal
                     text: i18n("Exclude internal Desktop Effects")
 
                     onToggled: searchModel.excludeInternal = checked
                 }
             }
         }
     }
 
     view: ListView {
         id: effectsList
 
         property var _buttonGroups: []
 
         spacing: Kirigami.Units.smallSpacing
 
         model: Private.EffectsFilterProxyModel {
             id: searchModel
 
             query: searchField.text
             sourceModel: kcm.effectsModel
         }
 
         delegate: Effect {
             width: effectsList.width
         }
 
         section.property: "CategoryRole"
         section.delegate: Item {
             width: effectsList.width
             height: sectionText.implicitHeight + 2 * Kirigami.Units.smallSpacing
 
             QtControls.Label {
                 id: sectionText
 
                 anchors.fill: parent
 
                 color: Kirigami.Theme.disabledTextColor
                 font.weight: Font.Bold
                 horizontalAlignment: Text.AlignHCenter
                 text: section
                 verticalAlignment: Text.AlignVCenter
             }
         }
 
         function findButtonGroup(name) {
             for (let item of effectsList._buttonGroups) {
                 if (item.name == name) {
                     return item.group;
                 }
             }
 
             let group = Qt.createQmlObject(
                 'import QtQuick 2.1;' +
                 'import QtQuick.Controls 2.5;' +
                 'ButtonGroup {}',
                 effectsList,
                 "dynamicButtonGroup" + effectsList._buttonGroups.length
             );
 
             effectsList._buttonGroups.push({ name, group });
 
             return group;
         }
     }
 
     footer: ColumnLayout {
         RowLayout {
             Layout.alignment: Qt.AlignRight
 
             QtControls.Button {
                 icon.name: "get-hot-new-stuff"
                 text: i18n("Get New Desktop Effects...")
                 visible: KAuthorized.authorize("ghns")
 
                 onClicked: kcm.openGHNS(this)
             }
         }
     }
 }