diff --git a/kcmkwin/common/effectsmodel.cpp b/kcmkwin/common/effectsmodel.cpp
index 47c264f16..492756757 100644
--- a/kcmkwin/common/effectsmodel.cpp
+++ b/kcmkwin/common/effectsmodel.cpp
@@ -1,684 +1,686 @@
 /********************************************************************
  KWin - the KDE window manager
  This file is part of the KDE project.
 
 Copyright (C) 2013 Antonis Tsiapaliokas <kok3rs@gmail.com>
 Copyright (C) 2018 Vlad Zahorodnii <vlad.zahorodnii@kde.org>
 
 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/>.
 *********************************************************************/
 
 #include "effectsmodel.h"
 
 #include <config-kwin.h>
 #include <effect_builtins.h>
 #include <kwin_effects_interface.h>
 
 #include <KAboutData>
 #include <KCModule>
 #include <KLocalizedString>
 #include <KPackage/PackageLoader>
 #include <KPluginLoader>
 #include <KPluginMetaData>
 #include <KPluginTrader>
 
 #include <QDBusConnection>
 #include <QDBusInterface>
 #include <QDBusMessage>
 #include <QDBusPendingCall>
 #include <QDialog>
 #include <QDialogButtonBox>
 #include <QPushButton>
 #include <QVBoxLayout>
 
 namespace KWin
 {
 
 static QString translatedCategory(const QString &category)
 {
     static const QVector<QString> knownCategories = {
         QStringLiteral("Accessibility"),
         QStringLiteral("Appearance"),
         QStringLiteral("Candy"),
         QStringLiteral("Focus"),
         QStringLiteral("Show Desktop Animation"),
         QStringLiteral("Tools"),
         QStringLiteral("Virtual Desktop Switching Animation"),
         QStringLiteral("Window Management"),
         QStringLiteral("Window Open/Close Animation")
     };
 
     static const QVector<QString> translatedCategories = {
         i18nc("Category of Desktop Effects, used as section header", "Accessibility"),
         i18nc("Category of Desktop Effects, used as section header", "Appearance"),
         i18nc("Category of Desktop Effects, used as section header", "Candy"),
         i18nc("Category of Desktop Effects, used as section header", "Focus"),
         i18nc("Category of Desktop Effects, used as section header", "Show Desktop Animation"),
         i18nc("Category of Desktop Effects, used as section header", "Tools"),
         i18nc("Category of Desktop Effects, used as section header", "Virtual Desktop Switching Animation"),
         i18nc("Category of Desktop Effects, used as section header", "Window Management"),
         i18nc("Category of Desktop Effects, used as section header", "Window Open/Close Animation")
     };
 
     const int index = knownCategories.indexOf(category);
     if (index == -1) {
         qDebug() << "Unknown category '" << category << "' and thus not translated";
         return category;
     }
 
     return translatedCategories[index];
 }
 
 static EffectsModel::Status effectStatus(bool enabled)
 {
     return enabled ? EffectsModel::Status::Enabled : EffectsModel::Status::Disabled;
 }
 
 EffectsModel::EffectsModel(QObject *parent)
     : QAbstractItemModel(parent)
 {
 }
 
 QHash<int, QByteArray> EffectsModel::roleNames() const
 {
     QHash<int, QByteArray> roleNames;
     roleNames[NameRole] = "NameRole";
     roleNames[DescriptionRole] = "DescriptionRole";
     roleNames[AuthorNameRole] = "AuthorNameRole";
     roleNames[AuthorEmailRole] = "AuthorEmailRole";
     roleNames[LicenseRole] = "LicenseRole";
     roleNames[VersionRole] = "VersionRole";
     roleNames[CategoryRole] = "CategoryRole";
     roleNames[ServiceNameRole] = "ServiceNameRole";
     roleNames[IconNameRole] = "IconNameRole";
     roleNames[StatusRole] = "StatusRole";
     roleNames[VideoRole] = "VideoRole";
     roleNames[WebsiteRole] = "WebsiteRole";
     roleNames[SupportedRole] = "SupportedRole";
     roleNames[ExclusiveRole] = "ExclusiveRole";
     roleNames[ConfigurableRole] = "ConfigurableRole";
     roleNames[ScriptedRole] = QByteArrayLiteral("ScriptedRole");
     roleNames[EnabledByDefaultRole] = "EnabledByDefaultRole";
     return roleNames;
 }
 
 QModelIndex EffectsModel::index(int row, int column, const QModelIndex &parent) const
 {
     if (parent.isValid() || column > 0 || column < 0 || row < 0 || row >= m_effects.count()) {
         return {};
     }
 
     return createIndex(row, column);
 }
 
 QModelIndex EffectsModel::parent(const QModelIndex &child) const
 {
     Q_UNUSED(child)
     return {};
 }
 
 int EffectsModel::columnCount(const QModelIndex &parent) const
 {
     Q_UNUSED(parent)
     return 1;
 }
 
 int EffectsModel::rowCount(const QModelIndex &parent) const
 {
     if (parent.isValid()) {
         return 0;
     }
     return m_effects.count();
 }
 
 QVariant EffectsModel::data(const QModelIndex &index, int role) const
 {
     if (!index.isValid()) {
         return {};
     }
 
     const EffectData effect = m_effects.at(index.row());
     switch (role) {
     case Qt::DisplayRole:
     case NameRole:
         return effect.name;
     case DescriptionRole:
         return effect.description;
     case AuthorNameRole:
         return effect.authorName;
     case AuthorEmailRole:
         return effect.authorEmail;
     case LicenseRole:
         return effect.license;
     case VersionRole:
         return effect.version;
     case CategoryRole:
         return effect.category;
     case ServiceNameRole:
         return effect.serviceName;
     case IconNameRole:
         return effect.iconName;
     case StatusRole:
         return static_cast<int>(effect.status);
     case VideoRole:
         return effect.video;
     case WebsiteRole:
         return effect.website;
     case SupportedRole:
         return effect.supported;
     case ExclusiveRole:
         return effect.exclusiveGroup;
     case InternalRole:
         return effect.internal;
     case ConfigurableRole:
         return effect.configurable;
     case ScriptedRole:
         return effect.kind == Kind::Scripted;
     case EnabledByDefaultRole:
         return effect.enabledByDefault;
     default:
         return {};
     }
 }
 
 bool EffectsModel::setData(const QModelIndex &index, const QVariant &value, int role)
 {
     if (!index.isValid()) {
         return QAbstractItemModel::setData(index, value, role);
     }
 
     if (role == StatusRole) {
         // note: whenever the StatusRole is modified (even to the same value) the entry
         // gets marked as changed and will get saved to the config file. This means the
         // config file could get polluted
         EffectData &data = m_effects[index.row()];
         data.status = Status(value.toInt());
         data.changed = data.status != data.originalStatus;
         emit dataChanged(index, index);
 
         if (data.status == Status::Enabled && !data.exclusiveGroup.isEmpty()) {
             // need to disable all other exclusive effects in the same category
             for (int i = 0; i < m_effects.size(); ++i) {
                 if (i == index.row()) {
                     continue;
                 }
                 EffectData &otherData = m_effects[i];
                 if (otherData.exclusiveGroup == data.exclusiveGroup) {
                     otherData.status = Status::Disabled;
                     otherData.changed = otherData.status != otherData.originalStatus;
                     emit dataChanged(this->index(i, 0), this->index(i, 0));
                 }
             }
         }
 
         return true;
     }
 
     return QAbstractItemModel::setData(index, value, role);
 }
 
 void EffectsModel::loadBuiltInEffects(const KConfigGroup &kwinConfig, const KPluginInfo::List &configs)
 {
     const auto builtins = BuiltInEffects::availableEffects();
     for (auto builtin : builtins) {
         const BuiltInEffects::EffectData &data = BuiltInEffects::effectData(builtin);
         EffectData effect;
         effect.name = data.displayName;
         effect.description = data.comment;
         effect.authorName = i18n("KWin development team");
         effect.authorEmail = QString(); // not used at all
         effect.license = QStringLiteral("GPL");
         effect.version = QStringLiteral(KWIN_VERSION_STRING);
         effect.untranslatedCategory = data.category;
         effect.category = translatedCategory(data.category);
         effect.serviceName = data.name;
         effect.iconName = QStringLiteral("preferences-system-windows");
         effect.enabledByDefault = data.enabled;
         effect.enabledByDefaultFunction = (data.enabledFunction != nullptr);
         const QString enabledKey = QStringLiteral("%1Enabled").arg(effect.serviceName);
         if (kwinConfig.hasKey(enabledKey)) {
             effect.status = effectStatus(kwinConfig.readEntry(effect.serviceName + "Enabled", effect.enabledByDefault));
         } else if (data.enabledFunction != nullptr) {
             effect.status = Status::EnabledUndeterminded;
         } else {
             effect.status = effectStatus(effect.enabledByDefault);
         }
         effect.originalStatus = effect.status;
         effect.video = data.video;
         effect.website = QUrl();
         effect.supported = true;
         effect.exclusiveGroup = data.exclusiveCategory;
         effect.internal = data.internal;
         effect.kind = Kind::BuiltIn;
 
         effect.configurable = std::any_of(configs.constBegin(), configs.constEnd(),
             [data](const KPluginInfo &info) {
                 return info.property(QStringLiteral("X-KDE-ParentComponents")).toString() == data.name;
             }
         );
 
         if (shouldStore(effect)) {
             m_pendingEffects << effect;
         }
     }
 }
 
 void EffectsModel::loadJavascriptEffects(const KConfigGroup &kwinConfig)
 {
     const auto plugins = KPackage::PackageLoader::self()->listPackages(
         QStringLiteral("KWin/Effect"),
         QStringLiteral("kwin/effects")
     );
     for (const KPluginMetaData &metaData : plugins) {
         KPluginInfo plugin(metaData);
         EffectData effect;
 
         effect.name = plugin.name();
         effect.description = plugin.comment();
         effect.authorName = plugin.author();
         effect.authorEmail = plugin.email();
         effect.license = plugin.license();
         effect.version = plugin.version();
         effect.untranslatedCategory = plugin.category();
         effect.category = translatedCategory(plugin.category());
         effect.serviceName = plugin.pluginName();
         effect.iconName = plugin.icon();
         effect.status = effectStatus(kwinConfig.readEntry(effect.serviceName + "Enabled", plugin.isPluginEnabledByDefault()));
         effect.originalStatus = effect.status;
         effect.enabledByDefault = plugin.isPluginEnabledByDefault();
         effect.enabledByDefaultFunction = false;
         effect.video = plugin.property(QStringLiteral("X-KWin-Video-Url")).toUrl();
         effect.website = QUrl(plugin.website());
         effect.supported = true;
         effect.exclusiveGroup = plugin.property(QStringLiteral("X-KWin-Exclusive-Category")).toString();
         effect.internal = plugin.property(QStringLiteral("X-KWin-Internal")).toBool();
         effect.kind = Kind::Scripted;
 
         const QString pluginKeyword = plugin.property(QStringLiteral("X-KDE-PluginKeyword")).toString();
         if (!pluginKeyword.isEmpty()) {
              // scripted effects have their pluginName() as the keyword
              effect.configurable = plugin.property(QStringLiteral("X-KDE-ParentComponents")).toString() == pluginKeyword;
         } else {
             effect.configurable = false;
         }
 
         if (shouldStore(effect)) {
             m_pendingEffects << effect;
         }
     }
 }
 
 void EffectsModel::loadPluginEffects(const KConfigGroup &kwinConfig, const KPluginInfo::List &configs)
 {
     const auto pluginEffects = KPluginLoader::findPlugins(
         QStringLiteral("kwin/effects/plugins/"),
         [](const KPluginMetaData &data) {
             return data.serviceTypes().contains(QStringLiteral("KWin/Effect"));
         }
     );
     for (const KPluginMetaData &pluginEffect : pluginEffects) {
         if (!pluginEffect.isValid()) {
             continue;
         }
         EffectData effect;
         effect.name = pluginEffect.name();
         effect.description = pluginEffect.description();
         effect.license = pluginEffect.license();
         effect.version = pluginEffect.version();
         effect.untranslatedCategory = pluginEffect.category();
         effect.category = translatedCategory(pluginEffect.category());
         effect.serviceName = pluginEffect.pluginId();
         effect.iconName = pluginEffect.iconName();
         effect.enabledByDefault = pluginEffect.isEnabledByDefault();
         effect.supported = true;
         effect.enabledByDefaultFunction = false;
         effect.internal = false;
         effect.kind = Kind::Binary;
 
         for (int i = 0; i < pluginEffect.authors().count(); ++i) {
             effect.authorName.append(pluginEffect.authors().at(i).name());
             effect.authorEmail.append(pluginEffect.authors().at(i).emailAddress());
             if (i+1 < pluginEffect.authors().count()) {
                 effect.authorName.append(", ");
                 effect.authorEmail.append(", ");
             }
         }
 
         if (pluginEffect.rawData().contains("org.kde.kwin.effect")) {
             const QJsonObject d(pluginEffect.rawData().value("org.kde.kwin.effect").toObject());
             effect.exclusiveGroup = d.value("exclusiveGroup").toString();
             effect.video = QUrl::fromUserInput(d.value("video").toString());
             effect.enabledByDefaultFunction = d.value("enabledByDefaultMethod").toBool();
         }
 
         effect.website = QUrl(pluginEffect.website());
 
         const QString enabledKey = QStringLiteral("%1Enabled").arg(effect.serviceName);
         if (kwinConfig.hasKey(enabledKey)) {
             effect.status = effectStatus(kwinConfig.readEntry(effect.serviceName + "Enabled", effect.enabledByDefault));
         } else if (effect.enabledByDefaultFunction) {
             effect.status = Status::EnabledUndeterminded;
         } else {
             effect.status = effectStatus(effect.enabledByDefault);
         }
 
         effect.originalStatus = effect.status;
 
         effect.configurable = std::any_of(configs.constBegin(), configs.constEnd(),
             [pluginEffect](const KPluginInfo &info) {
                 return info.property(QStringLiteral("X-KDE-ParentComponents")).toString() == pluginEffect.pluginId();
             }
         );
 
         if (shouldStore(effect)) {
             m_pendingEffects << effect;
         }
     }
 }
 
 void EffectsModel::load(LoadOptions options)
 {
     KConfigGroup kwinConfig(KSharedConfig::openConfig("kwinrc"), "Plugins");
 
     m_pendingEffects.clear();
     const KPluginInfo::List configs = KPluginTrader::self()->query(QStringLiteral("kwin/effects/configs/"));
     loadBuiltInEffects(kwinConfig, configs);
     loadJavascriptEffects(kwinConfig);
     loadPluginEffects(kwinConfig, configs);
 
     std::sort(m_pendingEffects.begin(), m_pendingEffects.end(),
         [](const EffectData &a, const EffectData &b) {
             if (a.category == b.category) {
                 if (a.exclusiveGroup == b.exclusiveGroup) {
                     return a.name < b.name;
                 }
                 return a.exclusiveGroup < b.exclusiveGroup;
             }
             return a.category < b.category;
         }
     );
 
     auto commit = [this, options] {
         if (options == LoadOptions::KeepDirty) {
             for (const EffectData &oldEffect : m_effects) {
                 if (!oldEffect.changed) {
                     continue;
                 }
                 auto effectIt = std::find_if(m_pendingEffects.begin(), m_pendingEffects.end(),
                     [oldEffect](const EffectData &data) {
                         return data.serviceName == oldEffect.serviceName;
                     }
                 );
                 if (effectIt == m_pendingEffects.end()) {
                     continue;
                 }
                 effectIt->status = oldEffect.status;
                 effectIt->changed = effectIt->status != effectIt->originalStatus;
             }
         }
 
         beginResetModel();
         m_effects = m_pendingEffects;
         m_pendingEffects.clear();
         endResetModel();
 
         emit loaded();
     };
 
     OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"),
                                          QStringLiteral("/Effects"),
                                          QDBusConnection::sessionBus());
 
     if (interface.isValid()) {
         QStringList effectNames;
         effectNames.reserve(m_pendingEffects.count());
         for (const EffectData &data : m_pendingEffects) {
             effectNames.append(data.serviceName);
         }
 
         const int serial = ++m_lastSerial;
 
         QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(interface.areEffectsSupported(effectNames), this);
         connect(watcher, &QDBusPendingCallWatcher::finished, this,
             [=](QDBusPendingCallWatcher *self) {
                 self->deleteLater();
 
                 if (m_lastSerial != serial) {
                     return;
                 }
 
                 const QDBusPendingReply<QList<bool > > reply = *self;
                 if (reply.isError()) {
                     commit();
                     return;
                 }
 
                 const QList<bool> supportedValues = reply.value();
                 if (supportedValues.count() != effectNames.count()) {
                     return;
                 }
 
                 for (int i = 0; i < effectNames.size(); ++i) {
                     const bool supported = supportedValues.at(i);
                     const QString effectName = effectNames.at(i);
 
                     auto it = std::find_if(m_pendingEffects.begin(), m_pendingEffects.end(),
                         [effectName](const EffectData &data) {
                             return data.serviceName == effectName;
                         }
                     );
                     if (it == m_pendingEffects.end()) {
                         continue;
                     }
 
                     if ((*it).supported != supported) {
                         (*it).supported = supported;
                     }
                 }
 
                 commit();
             }
         );
     } else {
         commit();
     }
 }
 
 void EffectsModel::updateEffectStatus(const QModelIndex &rowIndex, Status effectState)
 {
     setData(rowIndex, static_cast<int>(effectState), StatusRole);
 }
 
 void EffectsModel::save()
 {
     KConfigGroup kwinConfig(KSharedConfig::openConfig("kwinrc"), "Plugins");
 
     QVector<EffectData> dirtyEffects;
 
     for (EffectData &effect : m_effects) {
         if (!effect.changed) {
             continue;
         }
 
         effect.changed = false;
         effect.originalStatus = effect.status;
 
         const QString key = effect.serviceName + QStringLiteral("Enabled");
         const bool shouldEnable = (effect.status != Status::Disabled);
         const bool restoreToDefault = effect.enabledByDefaultFunction
             ? effect.status == Status::EnabledUndeterminded
             : shouldEnable == effect.enabledByDefault;
         if (restoreToDefault) {
             kwinConfig.deleteEntry(key);
         } else {
             kwinConfig.writeEntry(key, shouldEnable);
         }
 
         dirtyEffects.append(effect);
     }
 
     if (dirtyEffects.isEmpty()) {
         return;
     }
 
     kwinConfig.sync();
 
     OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"),
                                          QStringLiteral("/Effects"),
                                          QDBusConnection::sessionBus());
 
     if (!interface.isValid()) {
         return;
     }
 
     for (const EffectData &effect : dirtyEffects) {
         if (effect.status != Status::Disabled) {
             interface.loadEffect(effect.serviceName);
         } else {
             interface.unloadEffect(effect.serviceName);
         }
     }
 }
 
 void EffectsModel::defaults()
 {
     for (int i = 0; i < m_effects.count(); ++i) {
         const auto &effect = m_effects.at(i);
         if (effect.enabledByDefaultFunction && effect.status != Status::EnabledUndeterminded) {
             updateEffectStatus(index(i, 0), Status::EnabledUndeterminded);
         } else if (static_cast<bool>(effect.status) != effect.enabledByDefault) {
             updateEffectStatus(index(i, 0), effect.enabledByDefault ? Status::Enabled : Status::Disabled);
         }
     }
 }
 
 bool EffectsModel::isDefaults() const
 {
     return std::all_of(m_effects.constBegin(), m_effects.constEnd(), [](const EffectData &effect) {
         if (effect.enabledByDefaultFunction && effect.status != Status::EnabledUndeterminded) {
             return false;
         }
         if (static_cast<bool>(effect.status) != effect.enabledByDefault) {
             return false;
         }
         return true;
     });
 }
 
 bool EffectsModel::needsSave() const
 {
     return std::any_of(m_effects.constBegin(), m_effects.constEnd(),
         [](const EffectData &data) {
             return data.changed;
         }
     );
 }
 
 QModelIndex EffectsModel::findByPluginId(const QString &pluginId) const
 {
     auto it = std::find_if(m_effects.constBegin(), m_effects.constEnd(),
         [pluginId](const EffectData &data) {
             return data.serviceName == pluginId;
         }
     );
     if (it == m_effects.constEnd()) {
         return {};
     }
     return index(std::distance(m_effects.constBegin(), it), 0);
 }
 
 static KCModule *findBinaryConfig(const QString &pluginId, QObject *parent)
 {
     return KPluginTrader::createInstanceFromQuery<KCModule>(
         QStringLiteral("kwin/effects/configs/"),
         QString(),
         QStringLiteral("'%1' in [X-KDE-ParentComponents]").arg(pluginId),
         parent
     );
 }
 
 static KCModule *findScriptedConfig(const QString &pluginId, QObject *parent)
 {
     const auto offers = KPluginTrader::self()->query(
         QStringLiteral("kwin/effects/configs/"),
         QString(),
         QStringLiteral("[X-KDE-Library] == 'kcm_kwin4_genericscripted'")
     );
 
     if (offers.isEmpty()) {
         return nullptr;
     }
 
     const KPluginInfo &generic = offers.first();
     KPluginLoader loader(generic.libraryPath());
     KPluginFactory *factory = loader.factory();
     if (!factory) {
         return nullptr;
     }
 
     return factory->create<KCModule>(pluginId, parent);
 }
 
 void EffectsModel::requestConfigure(const QModelIndex &index, QWindow *transientParent)
 {
     if (!index.isValid()) {
         return;
     }
 
-    QPointer<QDialog> dialog = new QDialog();
+    auto dialog = new QDialog();
 
     KCModule *module = index.data(ScriptedRole).toBool()
         ? findScriptedConfig(index.data(ServiceNameRole).toString(), dialog)
         : findBinaryConfig(index.data(ServiceNameRole).toString(), dialog);
     if (!module) {
         delete dialog;
         return;
     }
 
     dialog->setWindowTitle(index.data(NameRole).toString());
     dialog->winId();
     dialog->windowHandle()->setTransientParent(transientParent);
 
     auto buttons = new QDialogButtonBox(
         QDialogButtonBox::Ok |
         QDialogButtonBox::Cancel |
         QDialogButtonBox::RestoreDefaults,
         dialog
     );
     connect(buttons, &QDialogButtonBox::accepted, dialog, &QDialog::accept);
     connect(buttons, &QDialogButtonBox::rejected, dialog, &QDialog::reject);
     connect(buttons->button(QDialogButtonBox::RestoreDefaults), &QPushButton::clicked,
         module, &KCModule::defaults);
     connect(module, &KCModule::defaulted, this, [=](bool defaulted) {
         buttons->button(QDialogButtonBox::RestoreDefaults)->setEnabled(!defaulted);
     });
 
     auto layout = new QVBoxLayout(dialog);
     layout->addWidget(module);
     layout->addWidget(buttons);
 
-    if (dialog->exec() == QDialog::Accepted) {
+    connect(dialog, &QDialog::accepted, module, [module]() {
         module->save();
-    }
+    });
 
-    delete dialog;
+    dialog->setModal(true);
+    dialog->setAttribute(Qt::WA_DeleteOnClose);
+    dialog->show();
 }
 
 bool EffectsModel::shouldStore(const EffectData &data) const
 {
     Q_UNUSED(data)
     return true;
 }
 
 }