diff --git a/sys/xvimage/xvcontext.c b/sys/xvimage/xvcontext.c
index 6d84e37eeb..b04a49cacc 100644
--- a/sys/xvimage/xvcontext.c
+++ b/sys/xvimage/xvcontext.c
@@ -1080,10 +1080,18 @@ gst_xwindow_set_title (GstXWindow * window, const gchar * title)
   /* we have a window */
   if (window->internal && title) {
     XTextProperty xproperty;
+    XClassHint *hint = XAllocClassHint ();
 
     if ((XStringListToTextProperty (((char **) &title), 1, &xproperty)) != 0) {
       XSetWMName (context->disp, window->win, &xproperty);
       XFree (xproperty.value);
+
+      if (hint) {
+        hint->res_name = g_strdup (title);
+        hint->res_class = g_strdup ("GStreamer");
+        XSetClassHint (context->disp, window->win, hint);
+      }
+      XFree (hint);
     }
   }
 }