diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c
index 05cb269..f8e52b2 100644
--- a/src/empathy-accounts.c
+++ b/src/empathy-accounts.c
@@ -231,6 +231,8 @@ main (int argc, char *argv[])
 
   g_set_application_name (_("Empathy Accounts"));
 
+  /* Make empathy and empathy-accounts appear as the same app in gnome-shell */
+  gdk_set_program_class ("Empathy");
   gtk_window_set_default_icon_name ("empathy");
   textdomain (GETTEXT_PACKAGE);
 
diff --git a/src/empathy-auth-client.c b/src/empathy-auth-client.c
index 530aa17..e5f35c6 100644
--- a/src/empathy-auth-client.c
+++ b/src/empathy-auth-client.c
@@ -258,6 +258,9 @@ main (int argc,
   gnutls_global_init ();
   g_set_application_name (_("Empathy authentication client"));
 
+  /* Make empathy and empathy-auth-client appear as the same app in
+   * gnome-shell */
+  gdk_set_program_class ("Empathy");
   gtk_window_set_default_icon_name ("empathy");
   textdomain (GETTEXT_PACKAGE);
 
diff --git a/src/empathy-av.c b/src/empathy-av.c
index 37438fe..6f8c5ba 100644
--- a/src/empathy-av.c
+++ b/src/empathy-av.c
@@ -134,6 +134,8 @@ main (int argc,
   g_set_application_name (_("Empathy Audio/Video Client"));
   g_setenv ("PULSE_PROP_media.role", "phone", TRUE);
 
+  /* Make empathy and empathy-av appear as the same app in gnome-shell */
+  gdk_set_program_class ("Empathy");
   gtk_window_set_default_icon_name ("empathy");
   textdomain (GETTEXT_PACKAGE);
 
diff --git a/src/empathy-chat.c b/src/empathy-chat.c
index db4000e..195f2eb 100644
--- a/src/empathy-chat.c
+++ b/src/empathy-chat.c
@@ -118,6 +118,8 @@ main (int argc,
 
   empathy_gtk_init ();
 
+  /* Make empathy and empathy-chat appear as the same app in gnome-shell */
+  gdk_set_program_class ("Empathy");
   gtk_window_set_default_icon_name ("empathy");
   textdomain (GETTEXT_PACKAGE);
 
diff --git a/src/empathy-debugger.c b/src/empathy-debugger.c
index ffd0341..3d38e71 100644
--- a/src/empathy-debugger.c
+++ b/src/empathy-debugger.c
@@ -65,6 +65,8 @@ main (int argc,
 
   g_set_application_name (_("Empathy Debugger"));
 
+  /* Make empathy and empathy-debugger appear as the same app in gnome-shell */
+  gdk_set_program_class ("Empathy");
   gtk_window_set_default_icon_name ("empathy");
   textdomain (GETTEXT_PACKAGE);
 
