diff --git a/applets/systemtray/package/contents/ui/ConfigEntries.qml b/applets/systemtray/package/contents/ui/ConfigEntries.qml
--- a/applets/systemtray/package/contents/ui/ConfigEntries.qml
+++ b/applets/systemtray/package/contents/ui/ConfigEntries.qml
@@ -225,7 +225,7 @@
                     id: keySequenceItem
                     anchors.right: parent.right
 
-                    keySequence: modelData.shortcut
+                    keySequence: modelData.shortcut ? modelData.shortcut : undefined
                     // only Plasmoids have that
                     visible: modelData.hasOwnProperty("shortcut")
                     onKeySequenceChanged: {
diff --git a/applets/systemtray/package/contents/ui/main.qml b/applets/systemtray/package/contents/ui/main.qml
--- a/applets/systemtray/package/contents/ui/main.qml
+++ b/applets/systemtray/package/contents/ui/main.qml
@@ -50,7 +50,7 @@
 
     property alias statusNotifierModel: statusNotifierModel
 
-    property Component plasmoidItemComponent
+    property Component plasmoidItemComponent: Qt.createComponent("items/PlasmoidItem.qml")
 
     Plasmoid.onExpandedChanged: {
         if (!plasmoid.expanded) {
@@ -102,9 +102,6 @@
     }
 
     Containment.onAppletAdded: {
-        if (!plasmoidItemComponent) {
-            plasmoidItemComponent = Qt.createComponent("items/PlasmoidItem.qml");
-        }
         //Allow the plasmoid expander to know in what window it will be
         var plasmoidContainer = plasmoidItemComponent.createObject(invisibleEntriesContainer, {"x": x, "y": y, "applet": applet});
 
@@ -234,7 +231,7 @@
     PlasmaCore.SortFilterModel {
         id: statusNotifierModel
         sourceModel: PlasmaCore.DataModel {
-            dataSource: statusNotifierSource
+            dataSource: statusNotifierSource.sources
         }
     }