diff --git a/containment/package/contents/ui/applet/ShortcutBadge.qml b/containment/package/contents/ui/applet/ShortcutBadge.qml
index dc746223b..593c16434 100644
--- a/containment/package/contents/ui/applet/ShortcutBadge.qml
+++ b/containment/package/contents/ui/applet/ShortcutBadge.qml
@@ -62,7 +62,7 @@ Loader{
             }
 
             if (root.showAppletShortcutBadges) {
-                var plasmaShortcut = universalSettings.appletShortcutBadge(applet.id);
+                var plasmaShortcut = applet ? universalSettings.appletShortcutBadge(applet.id) : "";
 
                 if (plasmaShortcut !== "") {
                     return plasmaShortcut;
diff --git a/containment/package/contents/ui/main.qml b/containment/package/contents/ui/main.qml
index 19914393d..5e987074b 100644
--- a/containment/package/contents/ui/main.qml
+++ b/containment/package/contents/ui/main.qml
@@ -1192,7 +1192,9 @@ DragDrop.DropArea {
         showMetaBadge = showMeta;
         applicationLauncherId = applicationLauncher;
 
-        root.latteApplet.parabolicManager.updateTasksEdgesIndexes();
+        if (latteApplet) {
+            latteApplet.parabolicManager.updateTasksEdgesIndexes();
+        }
     }
 
     // This is called by dockcorona in response to a Meta+number shortcut.