diff --git a/applets/digital-clock/package/contents/config/config.qml b/applets/digital-clock/package/contents/config/config.qml
index ce03b16d1..d38f3f180 100644
--- a/applets/digital-clock/package/contents/config/config.qml
+++ b/applets/digital-clock/package/contents/config/config.qml
@@ -1,61 +1,59 @@
 /*
  * Copyright 2013  Bhushan Shah <bhush94@gmail.com>
  * Copyright 2015  Martin Klapetek <mklapetek@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) version 3 or any later version
  * accepted by the membership of KDE e.V. (or its successor approved
  * by the membership of KDE e.V.), which shall act as a proxy
  * defined in Section 14 of version 3 of the license.
  *
  * 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.0
+import QtQml 2.2
 
 import org.kde.plasma.configuration 2.0
 import org.kde.plasma.calendar 2.0 as PlasmaCalendar
 
 ConfigModel {
     id: configModel
 
     ConfigCategory {
          name: i18n("Appearance")
          icon: "preferences-desktop-color"
          source: "configAppearance.qml"
     }
     ConfigCategory {
         name: i18n("Calendar")
         icon: "view-calendar"
         source: "configCalendar.qml"
     }
     ConfigCategory {
         name: i18n("Time Zones")
         icon: "preferences-system-time"
         source: "configTimeZones.qml"
     }
 
-    Component.onCompleted: {
-        var model = PlasmaCalendar.EventPluginsManager.model;
-
-        for (var i = 0; i < model.rowCount(); i++) {
-            //FIXME: this check doesn't work because the engines
-            //       of the applet and the config are not shared
-//             if (model.get(i, "checked") == true) {
-                configModel.appendCategory(model.get(i, "decoration"),
-                                        model.get(i, "display"),
-                                        model.get(i, "configUi"),
-                                        "",
-                                        true);
-//             }
+    property Instantiator __eventPlugins: Instantiator {
+        model: PlasmaCalendar.EventPluginsManager.model
+        delegate: ConfigCategory {
+            name: model.display
+            icon: model.decoration
+            source: model.configUi
+            visible: plasmoid.configuration.enabledCalendarPlugins.indexOf(model.pluginPath) > -1
         }
+
+        onObjectAdded: configModel.appendCategory(object)
+        onObjectRemoved: configModel.removeCategory(object)
     }
 }