diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index 40bdee2b09..5896a1db7d 100644
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -3156,13 +3156,11 @@ void wxListCtrl::OnPaint(wxPaintEvent& event)
 
             if (useDrawFix)
             {
-                dc.SetPen(*wxTRANSPARENT_PEN);
-                dc.SetBrush(wxBrush(GetBackgroundColour()));
+                wxDCPenChanger changePen(dc, *wxTRANSPARENT_PEN);
+                wxDCBrushChanger changeBrush(dc, GetBackgroundColour());
+
                 dc.DrawRectangle(0, topItemRect.GetY() - gap,
                                  clientSize.GetWidth(), gap);
-
-                dc.SetPen(pen);
-                dc.SetBrush(*wxTRANSPARENT_BRUSH);
             }
 
             const int numCols = GetColumnCount();