diff --git a/indicator/deviceindicator.cpp b/indicator/deviceindicator.cpp
index 8f172eb81..eb3e09793 100644
--- a/indicator/deviceindicator.cpp
+++ b/indicator/deviceindicator.cpp
@@ -64,7 +64,6 @@ DeviceIndicator::DeviceIndicator(DeviceDbusInterface* device)
     , m_device(device)
 {
     setIcon(QIcon::fromTheme(device->iconName()));
-    setToolTip(device->name());
 
     connect(device, SIGNAL(nameChanged(QString)), this, SLOT(setText(QString)));
 
diff --git a/indicator/main.cpp b/indicator/main.cpp
index 8a4f4c201..da4a15017 100644
--- a/indicator/main.cpp
+++ b/indicator/main.cpp
@@ -52,6 +52,7 @@ int main(int argc, char** argv)
     QSystemTrayIcon systray;
     systray.setIcon(QIcon::fromTheme("kdeconnect"));
     systray.setVisible(true);
+    systray.setToolTip("KDE Connect");
 
     QMenu *menu = new QMenu;