diff --git a/krunner/CMakeLists.txt b/krunner/CMakeLists.txt
--- a/krunner/CMakeLists.txt
+++ b/krunner/CMakeLists.txt
@@ -28,7 +28,9 @@
 
 install(TARGETS krunner ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 install(FILES ${krunner_dbusAppXML} DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR} )
-install(FILES krunner.desktop DESTINATION ${DATA_INSTALL_DIR}/kglobalaccel)
+
+configure_file(krunner.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/krunner.desktop @ONLY)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/krunner.desktop DESTINATION ${DATA_INSTALL_DIR}/kglobalaccel)
 
 set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KRunnerAppDBusInterface")
 configure_package_config_file(KRunnerAppDBusInterfaceConfig.cmake.in
diff --git a/krunner/krunner.desktop b/krunner/krunner.desktop.cmake
rename from krunner/krunner.desktop
rename to krunner/krunner.desktop.cmake
--- a/krunner/krunner.desktop
+++ b/krunner/krunner.desktop.cmake
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=krunner
+Exec=@CMAKE_INSTALL_PREFIX@/bin/krunner
 Name=KRunner
 Name[ar]=مشغّل.ك
 Name[bs]=KPokretač
@@ -51,6 +51,7 @@
 X-KDE-StartupNotify=false
 X-KDE-Shortcuts=Alt+Space,Alt+F2,Search
 Actions=RunClipboard
+X-KDE-Wayland-Interfaces=org_kde_plasma_window_management
 
 [Desktop Action RunClipboard]
 Exec=krunner -c
diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt
--- a/shell/CMakeLists.txt
+++ b/shell/CMakeLists.txt
@@ -81,9 +81,11 @@
   target_link_libraries(plasmashell Qt5::X11Extras)
 endif()
 
+configure_file(org.kde.plasmashell.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/org.kde.plasmashell.desktop @ONLY)
+
 install(TARGETS plasmashell ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
-install(FILES org.kde.plasmashell.desktop DESTINATION ${KDE_INSTALL_APPDIR})
-install(FILES org.kde.plasmashell.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTDIR})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.plasmashell.desktop DESTINATION ${KDE_INSTALL_APPDIR})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/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/org.kde.plasmashell.desktop b/shell/org.kde.plasmashell.desktop.cmake
rename from shell/org.kde.plasmashell.desktop
rename to shell/org.kde.plasmashell.desktop.cmake
--- a/shell/org.kde.plasmashell.desktop
+++ b/shell/org.kde.plasmashell.desktop.cmake
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=plasmashell
+Exec=@CMAKE_INSTALL_PREFIX@/bin/plasmashell
 X-DBUS-StartupType=Unique
 Name=Plasma Desktop Workspace
 Name[ar]=مساحة عمل سطح مكتب بلازما
@@ -56,3 +56,5 @@
 X-KDE-autostart-phase=0
 Icon=plasma
 NoDisplay=true
+
+X-KDE-Wayland-Interfaces=org_kde_plasma_window_management,org_kde_kwin_keystate