diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 3c474935..1d406514 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -436,6 +436,7 @@ patch_enable_all ()
 	enable_winecfg_Unmounted_Devices="$1"
 	enable_wined3d_1DTextures="$1"
 	enable_wined3d_Accounting="$1"
+	enable_wined3d_Backup_Window="$1"
 	enable_wined3d_CSMT_Helper="$1"
 	enable_wined3d_CSMT_Main="$1"
 	enable_wined3d_Copy_Resource_Typeless="$1"
@@ -1572,6 +1573,9 @@ patch_enable ()
 		wined3d-Accounting)
 			enable_wined3d_Accounting="$2"
 			;;
+		wined3d-Backup_Window)
+			enable_wined3d_Backup_Window="$2"
+			;;
 		wined3d-CSMT_Helper)
 			enable_wined3d_CSMT_Helper="$2"
 			;;
@@ -9307,6 +9311,18 @@ if test "$enable_wined3d_Accounting" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset wined3d-Backup_Window
+# |
+# | Modified files:
+# |   *	dlls/wined3d/context.c
+# |
+if test "$enable_wined3d_Backup_Window" -eq 1; then
+	patch_apply wined3d-Backup_Window/0001-wined3d-Fix-context-backup-window-handling.patch
+	(
+		printf '%s\n' '+    { "Sebastian Lackner", "wined3d: Fix context backup window handling.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset wined3d-Copy_Resource_Typeless
 # |
 # | This patchset has the following (direct or indirect) dependencies:
diff --git a/patches/wined3d-Backup_Window/0001-wined3d-Fix-context-backup-window-handling.patch b/patches/wined3d-Backup_Window/0001-wined3d-Fix-context-backup-window-handling.patch
new file mode 100644
index 00000000..4b29cd97
--- /dev/null
+++ b/patches/wined3d-Backup_Window/0001-wined3d-Fix-context-backup-window-handling.patch
@@ -0,0 +1,25 @@
+From b80174a0a4cb6ebd18b236681127f0c5da4e9073 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Mon, 24 Jul 2017 18:57:29 +0200
+Subject: wined3d: Fix context backup window handling.
+
+---
+ dlls/wined3d/context.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
+index be7650003cc..036e8c261f8 100644
+--- a/dlls/wined3d/context.c
++++ b/dlls/wined3d/context.c
+@@ -1109,7 +1109,7 @@ static BOOL context_set_pixel_format(struct wined3d_context *context, HDC dc, BO
+     if (dc == context->hdc && context->hdc_is_private && context->hdc_has_format)
+         return TRUE;
+ 
+-    if (dc == context->hdc && !context->hdc_is_private && WindowFromDC(dc) != context->win_handle)
++    if (dc == context->hdc && !private && WindowFromDC(dc) != context->win_handle)
+         return FALSE;
+ 
+     current = gl_info->gl_ops.wgl.p_wglGetPixelFormat(dc);
+-- 
+2.13.1
+