diff --git a/qml/main.qml b/qml/main.qml
index 4537460..81725fc 100644
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -51,6 +51,7 @@ Item {
             Layout.fillHeight: true
             Layout.preferredWidth: acticityLayout.implicitWidth + Meui.Units.largeSpacing
 
+            visible: acticityLabel.text
             onClicked: acticityMenu.open()
 
             RowLayout {
@@ -61,6 +62,7 @@ Item {
                 spacing: Meui.Units.largeSpacing
 
                 Label {
+                    id: acticityLabel
                     text: acticity.title
                 }
 
diff --git a/src/activity.cpp b/src/activity.cpp
index 3208f97..3a1497a 100644
--- a/src/activity.cpp
+++ b/src/activity.cpp
@@ -45,7 +45,17 @@ void Activity::close()
 
 void Activity::onActiveWindowChanged()
 {
-    KWindowInfo info(KWindowSystem::activeWindow(), NET::WMState | NET::WMVisibleName);
+    KWindowInfo info(KWindowSystem::activeWindow(),
+                     NET::WMState | NET::WMVisibleName,
+                     NET::WM2WindowClass);
+
+    // Skip...
+    if (info.windowClassClass() == "cutefish-launcher" ||
+        info.windowClassClass() == "cutefish-desktop") {
+        m_title.clear();
+        emit titleChanged();
+        return;
+    }
 
     QString title = info.visibleName();
     if (title != m_title) {