diff --git a/data/misc/net.zoite.Zoitechat.desktop.in.in b/data/misc/net.zoite.Zoitechat.desktop.in.in
index 26efc8f6..ecbb1678 100644
--- a/data/misc/net.zoite.Zoitechat.desktop.in.in
+++ b/data/misc/net.zoite.Zoitechat.desktop.in.in
@@ -9,7 +9,7 @@ Terminal=false
 Type=Application
 Categories=GTK;Network;IRCClient;
 StartupNotify=true
-StartupWMClass=Zoitechat
+StartupWMClass=net.zoite.Zoitechat
 X-GNOME-UsesNotifications=true
 MimeType=x-scheme-handler/irc;x-scheme-handler/ircs;application/x-zoitechat-theme;application/x-hexchat-theme;
 Actions=SafeMode;
diff --git a/src/fe-gtk/fe-gtk.c b/src/fe-gtk/fe-gtk.c
index c89db5b3..ea5785a3 100644
--- a/src/fe-gtk/fe-gtk.c
+++ b/src/fe-gtk/fe-gtk.c
@@ -123,6 +123,7 @@ fe_args (int argc, char *argv[])
 	GError *error = NULL;
 	GOptionContext *context;
 	char *buffer;
+	const char *desktop_id = "net.zoite.Zoitechat";
 
 #ifdef ENABLE_NLS
 	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
@@ -241,6 +242,10 @@ fe_args (int argc, char *argv[])
 	}
 #endif
 
+	g_set_prgname (desktop_id);
+#ifndef WIN32
+	gdk_set_program_class (desktop_id);
+#endif
 	gtk_init (&argc, &argv);
 
 #ifdef HAVE_GTK_MAC