diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt
index 28655489d..04ad01aee 100644
--- a/shell/CMakeLists.txt
+++ b/shell/CMakeLists.txt
@@ -1,114 +1,115 @@
 # Tell CMake to run moc when necessary:
 set(CMAKE_AUTOMOC ON)
 # As moc files are generated in the binary dir, tell CMake
 # to always look for includes there:
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
 
 find_package(Qt5Qml REQUIRED)
 find_package(Qt5Quick REQUIRED)
 find_package(Qt5DBus REQUIRED)
 find_package(Qt5Script REQUIRED)
 find_package(KF5CoreAddons REQUIRED)
 find_package(KF5Crash REQUIRED)
 find_package(KF5Solid REQUIRED)
 find_package(KF5Activities REQUIRED)
 find_package(KF5DBusAddons ${KF5_MIN_VERSION} REQUIRED)
 find_package(KF5Declarative ${KF5_MIN_VERSION} REQUIRED)
 find_package(KF5Package REQUIRED)
 
 configure_file(config-ktexteditor.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ktexteditor.h )
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-plasma.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-plasma.h)
 
 add_definitions(-DPLASMA_DEPRECATED=)
 
 set(scripting_SRC
     scripting/appinterface.cpp
     scripting/applet.cpp
     scripting/containment.cpp
     scripting/configgroup.cpp
     scripting/i18n.cpp
     scripting/panel.cpp
     scripting/rect.cpp
     scripting/scriptengine.cpp
     scripting/scriptengine_v1.cpp
     scripting/widget.cpp
 )
 
 set(plasmashell_dbusXML dbus/org.kde.PlasmaShell.xml)
 qt5_add_dbus_adaptor(scripting_SRC ${plasmashell_dbusXML} shellcorona.h ShellCorona plasmashelladaptor)
 
 ecm_qt_declare_logging_category(plasmashell HEADER debug.h
                                                IDENTIFIER PLASMASHELL
                                                CATEGORY_NAME kde.plasmashell
                                                DEFAULT_SEVERITY Info)
 
 set (plasma_shell_SRCS
     alternativeshelper.cpp
     main.cpp
     containmentconfigview.cpp
     currentcontainmentactionsmodel.cpp
     desktopview.cpp
     panelview.cpp
     panelconfigview.cpp
     panelshadows.cpp
     shellcorona.cpp
     shellmanager.cpp
     standaloneappcorona
     osd.cpp
     coronatesthelper.cpp
     debug.cpp
     screenpool.cpp
     ${scripting_SRC}
 )
 
 set(krunner_xml ${plasma-workspace_SOURCE_DIR}/krunner/dbus/org.kde.krunner.App.xml)
 qt5_add_dbus_interface(plasma_shell_SRCS ${krunner_xml} krunner_interface)
 
 add_executable(plasmashell
     ${plasma_shell_SRCS}
 )
 
 target_link_libraries(plasmashell
  Qt5::Quick
  Qt5::DBus
  KF5::KIOCore
  KF5::WindowSystem
  KF5::Crash
  KF5::Plasma
  KF5::PlasmaQuick
  Qt5::Script
  KF5::Solid
  KF5::Declarative
  KF5::I18n
  KF5::IconThemes
  KF5::Activities
  KF5::GlobalAccel
  KF5::CoreAddons
  KF5::DBusAddons
  KF5::Declarative
  KF5::QuickAddons
  KF5::XmlGui
  KF5::Package
  KF5::WaylandClient
 )
 target_include_directories(plasmashell PRIVATE "${CMAKE_BINARY_DIR}")
 target_compile_definitions(plasmashell PRIVATE -DPROJECT_VERSION="${PROJECT_VERSION}")
 
 if(HAVE_X11)
   target_link_libraries(plasmashell ${X11_LIBRARIES} ${XCB_LIBRARIES} )
   target_link_libraries(plasmashell Qt5::X11Extras)
 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
    scripting/plasma-layouttemplate.desktop
    DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR})
 
 add_subdirectory(packageplugins)
 add_subdirectory(autotests)
diff --git a/shell/plasmashell.desktop b/shell/org.kde.plasmashell.desktop
similarity index 98%
rename from shell/plasmashell.desktop
rename to shell/org.kde.plasmashell.desktop
index 2a86fe3b4..76aae8773 100644
--- a/shell/plasmashell.desktop
+++ b/shell/org.kde.plasmashell.desktop
@@ -1,56 +1,59 @@
 [Desktop Entry]
 Exec=plasmashell
 X-DBUS-StartupType=Unique
 Name=Plasma Desktop Workspace
 Name[ar]=مساحة عمل سطح مكتب بلازما
 Name[bs]=Radni prostor plazma radne površi
 Name[ca]=Espai de treball de l'escriptori Plasma
 Name[ca@valencia]=Espai de treball de l'escriptori Plasma
 Name[cs]=Pracovní plocha Plasma
 Name[da]=Plasma Desktop Workspace
 Name[de]=Plasma-Arbeitsflächenbereich
 Name[el]=Χώρος επιφάνειας εργασίας Plasma
 Name[en_GB]=Plasma Desktop Workspace
 Name[es]=Espacio de trabajo del escritorio Plasma
 Name[et]=Plasma töölaua töötsoon
 Name[eu]=Plasma mahaigainaren lanerako guneak
 Name[fi]=Plasma-työpöytä
 Name[fr]=Espace de travail Plasma
 Name[ga]=Spás Oibre Deisce Plasma
 Name[gl]=Espazo de traballo do escritorio Plasma
 Name[he]=תחנת עבודה של שולחן העבודה Plasma
 Name[hr]=Plasma radno okruženje
 Name[hu]=Plazma asztali munkaterület
 Name[ia]=Spatio de labor de scriptorio de Plasma
 Name[id]=Ruang Kerja Desktop Plasma
 Name[is]=Vinnurýmd Plasma skjáborðs
 Name[it]=Spazio di lavoro del desktop di Plasma
 Name[ja]=Plasma デスクトップワークスペース
 Name[ko]=Plasma 데스크톱 작업 공간
 Name[lt]=Plasma darbalaukio erdvė
 Name[nb]=Arbeidsrom for Plasma skrivebord
 Name[nds]=Plasma-Schriefdischarbeitrebeet
 Name[nl]=Plasma Bureaublad Werkplek
 Name[nn]=Arbeidsområde for Plasma-skrivebord
 Name[pa]=ਪਲਾਜ਼ਮਾ ਡੈਸਕਟਾਪ ਵਰਕਸਪੇਸ
 Name[pl]=Przestrzeń Robocza Pulpitu Plazmy
 Name[pt]=Área de Trabalho do Plasma
 Name[pt_BR]=Espaço de Trabalho Plasma
 Name[ru]=Рабочая среда Plasma
 Name[sk]=Pracovná plocha Plasma
 Name[sl]=Delovni prostor Plasma Desktop
 Name[sr]=Плазма, радни простор површи
 Name[sr@ijekavian]=Плазма, радни простор површи
 Name[sr@ijekavianlatin]=Plasma, radni prostor površi
 Name[sr@latin]=Plasma, radni prostor površi
 Name[sv]=Plasma arbetsområde för skrivbordet
 Name[tr]=Plasma Masaüstü Çalışma Alanı
 Name[uk]=Робочий простір Плазми для комп’ютерів
 Name[x-test]=xxPlasma Desktop Workspacexx
 Name[zh_CN]=Plasma 桌面工作空间
 Name[zh_TW]=Plasma 桌面工作空間
 Type=Application
 X-KDE-StartupNotify=false
 X-DBUS-ServiceName=org.kde.plasmashell
 OnlyShowIn=KDE;
 X-KDE-autostart-phase=0
+Icon=plasma
+Hidden=true
+