diff --git a/dll/cpl/intl/advanced.c b/dll/cpl/intl/advanced.c
index 3c9f51101fe..0fddc82b5ab 100644
--- a/dll/cpl/intl/advanced.c
+++ b/dll/cpl/intl/advanced.c
@@ -404,17 +404,14 @@ ListViewCustomDraw(
         case CDDS_ITEMPREPAINT:
             if (((PCPAGE)lplvcd->nmcd.lItemlParam)->Flags & CODEPAGE_NOT_REMOVEABLE)
             {
-                lplvcd->clrText   = GetSysColor(COLOR_GRAYTEXT);
-                lplvcd->clrTextBk = GetSysColor(COLOR_WINDOW);
-                return CDRF_NEWFONT;
+                lplvcd->clrText = GetSysColor(COLOR_GRAYTEXT);
             }
             else
             {
-                lplvcd->clrText   = GetSysColor(COLOR_WINDOWTEXT);
-                lplvcd->clrTextBk = GetSysColor(COLOR_WINDOW);
-                return CDRF_NEWFONT;
+                lplvcd->clrText = GetSysColor(COLOR_WINDOWTEXT);
             }
-            break;
+            lplvcd->clrTextBk = GetSysColor(COLOR_WINDOW);
+            return CDRF_NEWFONT;
     }
 
     return CDRF_DODEFAULT;