diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt
--- a/shell/CMakeLists.txt
+++ b/shell/CMakeLists.txt
@@ -103,7 +103,8 @@
 endif()
 
 install(TARGETS plasmashell ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
-install(FILES plasmashell.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTDIR})
+install(FILES org.kde.plasmashell.desktop DESTINATION ${KDE_INSTALL_APPDIR})
+install(FILES org.kde.plasmashell.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTDIR})
 install( FILES dbus/org.kde.PlasmaShell.xml DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR} )
 
 install(FILES
diff --git a/shell/plasmashell.desktop b/shell/org.kde.plasmashell.desktop
rename from shell/plasmashell.desktop
rename to shell/org.kde.plasmashell.desktop
--- a/shell/plasmashell.desktop
+++ b/shell/org.kde.plasmashell.desktop
@@ -54,3 +54,6 @@
 X-DBUS-ServiceName=org.kde.plasmashell
 OnlyShowIn=KDE;
 X-KDE-autostart-phase=0
+Icon=plasma
+Hidden=true
+