diff --git a/client/X11/xf_rail.c b/client/X11/xf_rail.c
index 3d64b04d3..ca815a771 100644
--- a/client/X11/xf_rail.c
+++ b/client/X11/xf_rail.c
@@ -98,10 +98,10 @@ void xf_rail_CreateWindow(rdpRail* rail, rdpWindow* window)
 			window->windowWidth, window->windowHeight,
 			window->windowId);
 
-	XStoreName(xfi->display, xfw->handle, window->title);
-
 	xf_SetWindowStyle(xfi, xfw, window->style, window->extendedStyle);
 
+	XStoreName(xfi->display, xfw->handle, window->title);
+
 	window->extra = (void*) xfw;
 	window->extraId = (void*) xfw->handle;
 }
diff --git a/client/X11/xf_window.c b/client/X11/xf_window.c
index b70f6d7ce..28f9a45ee 100644
--- a/client/X11/xf_window.c
+++ b/client/X11/xf_window.c
@@ -299,7 +299,6 @@ xfWindow* xf_CreateWindow(xfInfo* xfi, xfWindow* parent, int x, int y, int width
 			CWBorderPixel, &xfi->attribs);
 
 		xf_SetWindowDecorations(xfi, window, window->decorations);
-		xf_SetWindowUnlisted(xfi, window);
 
 		class_hints = XAllocClassHint();