diff --git a/client/X11/xf_window.c b/client/X11/xf_window.c
index 8a5cbe1cc..9714330ce 100644
--- a/client/X11/xf_window.c
+++ b/client/X11/xf_window.c
@@ -491,15 +491,11 @@ xfWindow* xf_CreateWindow(xfInfo* xfi, rdpWindow* wnd, int x, int y, int width,
 	window->height = height;
 
 	/*
-	 * this window need decorations the WS_EX_APPWINDOW is used to
-	 * tell the client to use local decorations only sent from xrdp
-	 *
-	 * Marc: we need to find another value than WS_EX_APPWINDOW for XRDP
-	 * since it is used by the Microsoft RDP server for programs like cmd.exe
+	 * WS_EX_DECORATIONS is used by XRDP and instructs
+	 * the client to use local window decorations
 	 */
 
-	window->decorations = FALSE;
-	//window->decorations = (wnd->extendedStyle & WS_EX_APPWINDOW) ? TRUE : FALSE;
+	window->decorations = (wnd->extendedStyle & WS_EX_DECORATIONS) ? TRUE : FALSE;
 
 	window->fullscreen = FALSE;
 	window->window = wnd;
diff --git a/include/freerdp/window.h b/include/freerdp/window.h
index 94fa5c174..3357d89bd 100644
--- a/include/freerdp/window.h
+++ b/include/freerdp/window.h
@@ -120,6 +120,13 @@
 #define WS_EX_WINDOWEDGE		0x00000100
 #endif
 
+/**
+ * This is a custom extended window style used by XRDP
+ * instructing the client to use local window decorations
+ */
+
+#define WS_EX_DECORATIONS		0x40000000
+
 struct _WINDOW_ORDER_INFO
 {
 	UINT32 windowId;