diff --git a/app/main.c b/app/main.c
index deb63e833f..9db78ed8e3 100644
--- a/app/main.c
+++ b/app/main.c
@@ -544,7 +544,6 @@ main (int    argc,
   GOptionContext *context;
   GError         *error = NULL;
   const gchar    *abort_message;
-  gchar          *basename;
   GFile          *system_gimprc_file = NULL;
   GFile          *user_gimprc_file   = NULL;
   GOptionGroup   *gimp_group         = NULL;
@@ -674,9 +673,7 @@ main (int    argc,
   argv = g_strdupv (argv);
 #endif
 
-  basename = g_path_get_basename (argv[0]);
-  g_set_prgname (basename);
-  g_free (basename);
+  g_set_prgname (GIMP_DESKTOP_NAME);
 
   /* Check argv[] for "--verbose" first */
   for (i = 1; i < argc; i++)
diff --git a/desktop/meson.build b/desktop/meson.build
index 4203695a58..ec2d445bb6 100644
--- a/desktop/meson.build
+++ b/desktop/meson.build
@@ -1,4 +1,4 @@
-desktopfilename = 'gimp.desktop'
+desktopfilename = gimp_desktop_name + '.desktop'
 
 desktop_conf = configuration_data()
 desktop_conf.set('GIMP_COMMAND',      gimp_command)
diff --git a/meson.build b/meson.build
index 1d2bba6232..e8ac884570 100644
--- a/meson.build
+++ b/meson.build
@@ -79,6 +79,9 @@ so_version = '@0@.@1@.@2@'.format(lt_current - lt_age, lt_age, lt_revision)
 
 gimp_command  = 'gimp-' + gimp_app_version
 
+# A specific desktop name to fix window icon under Wayland
+gimp_desktop_name = 'gimp'
+
 gettext_package= 'gimp@0@@1@'.format(api_version_major, api_version_minor)
 conf.set_quoted('GETTEXT_PACKAGE', gettext_package)
 
@@ -1648,6 +1651,7 @@ conf.set_quoted('GIMP_PACKAGE',   meson.project_name())
 conf.set_quoted('PACKAGE_NAME',   meson.project_name())
 conf.set_quoted('PACKAGE_STRING', package_string)
 conf.set_quoted('GIMP_COMMAND',   gimp_command)
+conf.set_quoted('GIMP_DESKTOP_NAME', gimp_desktop_name)
 
 # Versions
 conf.set_quoted('GIMP_APP_VERSION_STRING',gimp_app_version)