diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index eb80e373..e710cb38 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -8768,8 +8768,10 @@ fi
 # |
 if test "$enable_winex11_MWM_Decorations" -eq 1; then
 	patch_apply winex11-MWM_Decorations/0001-winex11.drv-Don-t-use-MWM_DECOR_RESIZEH-window-resiz.patch
+	patch_apply winex11-MWM_Decorations/0002-winex11.drv-Don-t-add-MWM_DECOR_BORDER-to-windows-wi.patch
 	(
 		printf '%s\n' '+    { "Dmitry Timoshkov", "winex11.drv: Don'\''t use MWM_DECOR_RESIZEH, window resizing is controlled by MWM_FUNC_RESIZE.", 1 },';
+		printf '%s\n' '+    { "Dmitry Timoshkov", "winex11.drv: Don'\''t add MWM_DECOR_BORDER to windows without a caption.", 1 },';
 	) >> "$patchlist"
 fi
 
diff --git a/patches/winex11-MWM_Decorations/0002-winex11.drv-Don-t-add-MWM_DECOR_BORDER-to-windows-wi.patch b/patches/winex11-MWM_Decorations/0002-winex11.drv-Don-t-add-MWM_DECOR_BORDER-to-windows-wi.patch
new file mode 100644
index 00000000..039ae454
--- /dev/null
+++ b/patches/winex11-MWM_Decorations/0002-winex11.drv-Don-t-add-MWM_DECOR_BORDER-to-windows-wi.patch
@@ -0,0 +1,27 @@
+From d2f3b7e3a70a64665ad77b7b2a97f3c7ea9425db Mon Sep 17 00:00:00 2001
+From: Dmitry Timoshkov <dmitry@baikal.ru>
+Date: Fri, 20 Jan 2017 17:08:19 +0800
+Subject: winex11.drv: Don't add MWM_DECOR_BORDER to windows without a caption.
+
+XFCE4 always treats such windows as requesting the caption decoration.
+---
+ dlls/winex11.drv/window.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
+index 0fc36dc3c6d..af641c76eb1 100644
+--- a/dlls/winex11.drv/window.c
++++ b/dlls/winex11.drv/window.c
+@@ -278,9 +278,6 @@ static unsigned long get_mwm_decorations( struct x11drv_win_data *data,
+         if (style & WS_MINIMIZEBOX) ret |= MWM_DECOR_MINIMIZE;
+         if (style & WS_MAXIMIZEBOX) ret |= MWM_DECOR_MAXIMIZE;
+     }
+-    if (ex_style & WS_EX_DLGMODALFRAME) ret |= MWM_DECOR_BORDER;
+-    else if (style & WS_THICKFRAME) ret |= MWM_DECOR_BORDER;
+-    else if ((style & (WS_DLGFRAME|WS_BORDER)) == WS_DLGFRAME) ret |= MWM_DECOR_BORDER;
+     return ret;
+ }
+ 
+-- 
+2.11.0
+