diff --git a/applets/kicker/plugin/actionlist.cpp b/applets/kicker/plugin/actionlist.cpp
--- a/applets/kicker/plugin/actionlist.cpp
+++ b/applets/kicker/plugin/actionlist.cpp
@@ -149,12 +149,12 @@
         actionList << Kicker::createActionItem(i18n("Add to Desktop"), "addToDesktop");
     }
 
-    if (ContainmentInterface::mayAddLauncher(appletInterface, ContainmentInterface::Panel)) {
-        actionList << Kicker::createActionItem(i18n("Add to Panel (Widget)"), "addToPanel");
-    }
-
+    // to avoid confusing users, only show "Pin to Task Manager" if there's a Task Manager (see Bug 390817)
+    // If there's no Task Manager and the panel is unlocked, show "Add to Panel (Widget)" instead
     if (service && ContainmentInterface::mayAddLauncher(appletInterface, ContainmentInterface::TaskManager, service->entryPath())) {
         actionList << Kicker::createActionItem(i18n("Pin to Task Manager"), "addToTaskManager");
+    } else if (ContainmentInterface::mayAddLauncher(appletInterface, ContainmentInterface::Panel)) {
+        actionList << Kicker::createActionItem(i18n("Add to Panel (Widget)"), "addToPanel");
     }
 
     return actionList;