diff --git a/patches/comctl32-Listview_DrawItem/0001-comctl32-Preserve-custom-colors-between-subitems.patch b/patches/comctl32-Listview_DrawItem/0001-comctl32-Preserve-custom-colors-between-subitems.patch
index e6ca00e2..3d8bf09b 100644
--- a/patches/comctl32-Listview_DrawItem/0001-comctl32-Preserve-custom-colors-between-subitems.patch
+++ b/patches/comctl32-Listview_DrawItem/0001-comctl32-Preserve-custom-colors-between-subitems.patch
@@ -1,27 +1,26 @@
-From ddc5f6fd9dde7a5cdde0be59d4a9db9e086400a9 Mon Sep 17 00:00:00 2001
+From 3497a2faa4ebab67b65bcf99d4ed56baa70ddf96 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 12 Jul 2014 23:58:19 +0200
-Subject: comctl32: Preserve custom colors between subitems. (v2)
+Subject: [PATCH] comctl32: Preserve custom colors between subitems. (v2)
 
 ---
- dlls/comctl32/listview.c       | 20 +++++++++-----------
- dlls/comctl32/tests/listview.c | 23 ++++++++++++++++++++---
- 2 files changed, 29 insertions(+), 14 deletions(-)
+ dlls/comctl32/listview.c | 15 +++++++++------
+ 1 file changed, 9 insertions(+), 6 deletions(-)
 
 diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
-index 56e2563..a35f5f2 100644
+index dba16d13a4c..35cab333b7b 100644
 --- a/dlls/comctl32/listview.c
 +++ b/dlls/comctl32/listview.c
-@@ -1072,7 +1072,7 @@ static void prepaint_setup (const LISTVIEW_INFO *infoPtr, HDC hdc, NMLVCUSTOMDRA
-     COLORREF backcolor, textcolor;
+@@ -1063,7 +1063,7 @@ static void prepaint_setup (const LISTVIEW_INFO *infoPtr, HDC hdc, const NMLVCUS
+     textcolor = cd->clrText;
  
      /* apparently, for selected items, we have to override the returned values */
 -    if (!SubItem)
 +    if (!SubItem || (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT))
      {
-         if (lpnmlvcd->nmcd.uItemState & CDIS_SELECTED)
+         if (cd->nmcd.uItemState & CDIS_SELECTED)
          {
-@@ -4784,6 +4784,7 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, ITERAT
+@@ -4786,6 +4786,7 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, ITERAT
          while (iterator_next(subitems))
          {
              DWORD subitemstage = CDRF_DODEFAULT;
@@ -29,15 +28,9 @@ index 56e2563..a35f5f2 100644
  
              /* We need to query for each subitem, item's data (subitem == 0) is already here at this point */
              if (subitems->nItem)
-@@ -4810,19 +4811,16 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, ITERAT
- 
+@@ -4813,13 +4814,15 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, ITERAT
              if (cdsubitemmode & CDRF_NOTIFYSUBITEMDRAW)
                  subitemstage = notify_customdraw(infoPtr, CDDS_SUBITEM | CDDS_ITEMPREPAINT, &nmlvcd);
--            else
--            {
--                nmlvcd.clrTextBk = infoPtr->clrTextBk;
--                nmlvcd.clrText   = infoPtr->clrText;
--            }
  
 -            if (subitems->nItem == 0 || (cdmode & CDRF_NOTIFYITEMDRAW))
 -                prepaint_setup(infoPtr, hdc, &nmlvcd, FALSE);
@@ -57,5 +50,5 @@ index 56e2563..a35f5f2 100644
              if (subitemstage & CDRF_NOTIFYPOSTPAINT)
                  subitemstage = notify_customdraw(infoPtr, CDDS_SUBITEM | CDDS_ITEMPOSTPAINT, &nmlvcd);
 -- 
-2.9.0
+2.27.0
 
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index c2f1fb3b..5fa768aa 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "a455ff61b40ff73b48d0ccc9c1f14679bb65ab8d"
+	echo "a599d645e33a128fae2d6fbfd7fdc07a8cefda95"
 }
 
 # Show version information
diff --git a/staging/upstream-commit b/staging/upstream-commit
index 7d7e545b..4f7719e3 100644
--- a/staging/upstream-commit
+++ b/staging/upstream-commit
@@ -1 +1 @@
-a455ff61b40ff73b48d0ccc9c1f14679bb65ab8d
+a599d645e33a128fae2d6fbfd7fdc07a8cefda95