diff --git a/client/SDL/SDL2/CMakeLists.txt b/client/SDL/SDL2/CMakeLists.txt
index a22b8da30..e29f73826 100644
--- a/client/SDL/SDL2/CMakeLists.txt
+++ b/client/SDL/SDL2/CMakeLists.txt
@@ -79,10 +79,10 @@ if(NOT WITH_CLIENT_SDL_VERSIONED)
 endif()
 
 string(TIMESTAMP SDL_CLIENT_YEAR "%Y")
-set(SDL_CLIENT_UUID "com.freerdp.client.sdl3")
+set(SDL_CLIENT_UUID "com.freerdp.client.sdl2")
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/sdl_config.hpp.in ${CMAKE_CURRENT_BINARY_DIR}/sdl_config.hpp @ONLY)
 
 install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT client)
-install_freerdp_desktop("${MODULE_NAME}")
+install_freerdp_desktop("${MODULE_NAME}" "${SDL_CLIENT_UUID}")
 
 add_subdirectory(man)
diff --git a/client/SDL/SDL3/CMakeLists.txt b/client/SDL/SDL3/CMakeLists.txt
index d6b8e4851..0b4f5016d 100644
--- a/client/SDL/SDL3/CMakeLists.txt
+++ b/client/SDL/SDL3/CMakeLists.txt
@@ -85,6 +85,6 @@ set(SDL_CLIENT_UUID "com.freerdp.client.sdl3")
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/sdl_config.hpp.in ${CMAKE_CURRENT_BINARY_DIR}/sdl_config.hpp @ONLY)
 
 install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT client)
-install_freerdp_desktop("${MODULE_NAME}" "${MODULE_NAME}")
+install_freerdp_desktop("${MODULE_NAME}" "${SDL_CLIENT_UUID}")
 
 add_subdirectory(man)
diff --git a/cmake/InstallFreeRDPDesktop.cmake b/cmake/InstallFreeRDPDesktop.cmake
index 015a6b5ce..1e37c0ac3 100644
--- a/cmake/InstallFreeRDPDesktop.cmake
+++ b/cmake/InstallFreeRDPDesktop.cmake
@@ -6,6 +6,12 @@ set(DESKTOP_RESOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/../resources" CACHE INTERNAL
 
 function(install_freerdp_desktop name)
   if(WITH_INSTALL_CLIENT_DESKTOP_FILES)
+    if(${ARGC} GREATER 1)
+      set(FREERDP_STARTUP_CLASS ${ARGV1})
+    else()
+      set(FREERDP_STARTUP_CLASS ${name})
+    endif()
+
     get_target_property(FREERDP_APP_NAME ${name} OUTPUT_NAME)
     set(FREERDP_BIN_NAME "${CMAKE_INSTALL_FULL_BINDIR}/${FREERDP_APP_NAME}")
     set(FREERDP_DESKTOP_NAME "${CMAKE_CURRENT_BINARY_DIR}/${FREERDP_BIN_NAME}.desktop")
diff --git a/resources/freerdp.desktop.template b/resources/freerdp.desktop.template
index d77730023..82458775a 100644
--- a/resources/freerdp.desktop.template
+++ b/resources/freerdp.desktop.template
@@ -10,4 +10,4 @@ Type=Application
 Keywords=remote desktop;rdp;
 Categories=GTK;GNOME;X-GNOME-NetworkSettings;Network;
 StartupNotify=true
-StartupWMClass=com.freerdp.FreeRDP
+StartupWMClass=@FREERDP_STARTUP_CLASS@