diff --git a/useractions.cpp b/useractions.cpp
index 5309286b40..60274cd0bb 100644
--- a/useractions.cpp
+++ b/useractions.cpp
@@ -271,7 +271,7 @@ void Workspace::clientPopupAboutToShow()
         {
         initDesktopPopup();
         }
-    QStringList act = activityController_.availableActivities();
+    QStringList act = openActivityList();
     kDebug() << "activities:" << act.size();
     if ( act.size() < 2 )
         {
@@ -544,15 +544,16 @@ void Workspace::activityPopupAboutToShow()
         action->setChecked( true );
     activity_popup->addSeparator();
 
-    foreach (const QString &activity, activityController_.availableActivities()) {
-        QString name = KActivityInfo::name(activity);
+    foreach (const QString &id, openActivityList()) {
+        KActivityInfo activity(id);
+        QString name = activity.name();
         name.replace('&', "&&");
-        action = activity_popup->addAction( name );
-        action->setData( activity );
+        action = activity_popup->addAction( KIcon(activity.icon()), name );
+        action->setData( id );
         action->setCheckable( true );
 
         if ( active_popup_client &&
-             !active_popup_client->isOnAllActivities() && active_popup_client->isOnActivity(activity) )
+             !active_popup_client->isOnAllActivities() && active_popup_client->isOnActivity(id) )
             action->setChecked( true );
         }
     }
diff --git a/workspace.cpp b/workspace.cpp
index 53384ec23d..0bd618eccf 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -373,7 +373,7 @@ void Workspace::init()
         }
     if( !setCurrentDesktop( initial_desktop ))
         setCurrentDesktop( 1 );
-    allActivities_ = activityController_.availableActivities();
+    allActivities_ = activityController_.listActivities();
     updateCurrentActivity( activityController_.currentActivity() );
 
     // Now we know how many desktops we'll have, thus we initialize the positioning object