diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 65c97e5c..e80771fb 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -6355,6 +6355,7 @@ if test "$enable_uxtheme_GTK_Theming" -eq 1; then
 	patch_apply uxtheme-GTK_Theming/0005-uxthemegtk-Print-class-name-before-calling-vtable-fu.patch
 	patch_apply uxtheme-GTK_Theming/0006-uxthemegtk-Reset-FPU-flags-before-calling-GTK3-funct.patch
 	patch_apply uxtheme-GTK_Theming/0007-uxthemegtk-Add-export-for-OpenThemeDataEx.patch
+	patch_apply uxtheme-GTK_Theming/0008-uxthemegtk-Fix-some-incorrect-error-codes.patch
 	(
 		echo '+    { "Michael Müller", "uxthemegtk: Add configure check and stub dll.", 1 },';
 		echo '+    { "Ivan Akulinchev", "uxthemegtk: Initial implementation.", 1 },';
@@ -6363,6 +6364,7 @@ if test "$enable_uxtheme_GTK_Theming" -eq 1; then
 		echo '+    { "Michael Müller", "uxthemegtk: Print class name before calling vtable functions.", 1 },';
 		echo '+    { "Michael Müller", "uxthemegtk: Reset FPU flags before calling GTK3 functions.", 1 },';
 		echo '+    { "Sebastian Lackner", "uxthemegtk: Add export for OpenThemeDataEx.", 1 },';
+		echo '+    { "Sebastian Lackner", "uxthemegtk: Fix some incorrect error codes.", 1 },';
 	) >> "$patchlist"
 fi
 
diff --git a/patches/uxtheme-GTK_Theming/0008-uxthemegtk-Fix-some-incorrect-error-codes.patch b/patches/uxtheme-GTK_Theming/0008-uxthemegtk-Fix-some-incorrect-error-codes.patch
new file mode 100644
index 00000000..87288b31
--- /dev/null
+++ b/patches/uxtheme-GTK_Theming/0008-uxthemegtk-Fix-some-incorrect-error-codes.patch
@@ -0,0 +1,43 @@
+From 60dd76b04fa8aad2200f91660d0277a1c403dbab Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Wed, 27 Jan 2016 08:16:10 +0100
+Subject: uxthemegtk: Fix some incorrect error codes.
+
+---
+ dlls/uxtheme-gtk/uxtheme.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/dlls/uxtheme-gtk/uxtheme.c b/dlls/uxtheme-gtk/uxtheme.c
+index ab369f5..631c4da 100644
+--- a/dlls/uxtheme-gtk/uxtheme.c
++++ b/dlls/uxtheme-gtk/uxtheme.c
+@@ -519,7 +519,7 @@ HTHEME WINAPI OpenThemeDataEx(HWND hwnd, LPCWSTR classlist, DWORD flags)
+     /* comctl32.dll likes to send NULL */
+     if (classlist == NULL)
+     {
+-        SetLastError(ERROR_INVALID_PARAMETER);
++        SetLastError(E_POINTER);
+         return NULL;
+     }
+ 
+@@ -578,7 +578,7 @@ HRESULT WINAPI SetWindowTheme(HWND hwnd, LPCWSTR sub_app_name,
+     FIXME("(%p, %s, %s)\n", hwnd, debugstr_w(sub_app_name),
+           debugstr_w(sub_id_list));
+ 
+-    return E_NOTIMPL;
++    return S_OK;
+ }
+ 
+ HRESULT WINAPI GetThemeBool(HTHEME htheme, int part_id, int state_id,
+@@ -1145,7 +1145,7 @@ BOOL WINAPI IsThemePartDefined(HTHEME htheme, int part_id, int state_id)
+ 
+     if (theme == NULL || theme->vtable == NULL)
+     {
+-        SetLastError(ERROR_INVALID_HANDLE);
++        SetLastError(E_HANDLE);
+         return FALSE;
+     }
+ 
+-- 
+2.6.4
+