diff --git a/src/kcmkwin/kwinrules/package/contents/ui/RulesEditor.qml b/src/kcmkwin/kwinrules/package/contents/ui/RulesEditor.qml
index 83a99b02a2..314a217b6a 100644
--- a/src/kcmkwin/kwinrules/package/contents/ui/RulesEditor.qml
+++ b/src/kcmkwin/kwinrules/package/contents/ui/RulesEditor.qml
@@ -218,8 +218,7 @@ ScrollViewKCM {
                     }
                     QQC2.ToolButton {
                         icon.name: (model.enabled) ? "dialog-ok-apply" : "list-add"
-                        opacity: propertyDelegate.hovered ? 1 : 0
-                        onClicked: propertyDelegate.clicked()
+                        onClicked: addProperty();
                         Layout.preferredWidth: implicitWidth
                         Layout.leftMargin: -Kirigami.Units.smallSpacing
                         Layout.rightMargin: -Kirigami.Units.smallSpacing
@@ -228,14 +227,16 @@ ScrollViewKCM {
                 }
 
                 onClicked: {
+                    addProperty();
+                    propertySheet.close();
+                }
+
+                function addProperty() {
                     model.enabled = true;
                     if (model.suggested != null) {
                         model.value = model.suggested;
                         model.suggested = null;
                     }
-                    if (!overlayModel.onlySuggestions) {
-                        propertySheet.close();
-                    }
                 }
             }
         }