diff --git a/desktop/gimp.desktop.in.in b/desktop/gimp.desktop.in.in
index ca9b81babe..cd1d6336cb 100644
--- a/desktop/gimp.desktop.in.in
+++ b/desktop/gimp.desktop.in.in
@@ -18,4 +18,4 @@ Terminal=false
 Categories=Graphics;2DGraphics;RasterGraphics;GTK;
 StartupNotify=true
 MimeType=@MIME_TYPES@
-StartupWMClass=gimp-@GIMP_APP_VERSION@
+StartupWMClass=@GIMP_DESKTOP_NAME@
diff --git a/desktop/meson.build b/desktop/meson.build
index ec2d445bb6..e913387d0f 100644
--- a/desktop/meson.build
+++ b/desktop/meson.build
@@ -4,6 +4,7 @@ desktop_conf = configuration_data()
 desktop_conf.set('GIMP_COMMAND',      gimp_command)
 desktop_conf.set('GIMP_VERSION',      gimp_version)
 desktop_conf.set('GIMP_APP_VERSION',  gimp_app_version)
+desktop_conf.set('GIMP_DESKTOP_NAME', gimp_desktop_name)
 desktop_conf.set('MIME_TYPES',        ';'.join(MIMEtypes))
 desktop_conf.set('BUG_REPORT_URL',    bug_report_url)