diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp
index 2cb82477996..6470f098502 100644
--- a/platform/x11/os_x11.cpp
+++ b/platform/x11/os_x11.cpp
@@ -204,6 +204,20 @@ void OS_X11::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi
 
 	XChangeWindowAttributes(x11_display, x11_window,CWEventMask,&new_attr);
 	
+    XClassHint* classHint;
+
+    /* set the titlebar name */
+    XStoreName(x11_display, x11_window, "Godot");
+
+    /* set the name and class hints for the window manager to use */
+    classHint = XAllocClassHint();
+    if (classHint) {
+        classHint->res_name = "Godot";
+        classHint->res_class = "Godot";
+    }
+    XSetClassHint(x11_display, x11_window, classHint);
+    XFree(classHint);
+
 	wm_delete = XInternAtom(x11_display, "WM_DELETE_WINDOW", true);	
 	XSetWMProtocols(x11_display, x11_window, &wm_delete, 1);