diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp
index 252e3392af6..9133fba29dc 100644
--- a/dll/win32/shell32/shlexec.cpp
+++ b/dll/win32/shell32/shlexec.cpp
@@ -1429,8 +1429,10 @@ static UINT_PTR SHELL_execute_url( LPCWSTR lpFile, LPCWSTR wFile, LPCWSTR wcmd,
 void do_error_dialog( UINT_PTR retval, HWND hwnd, WCHAR* filename)
 {
     WCHAR msg[2048];
-    DWORD error_code = GetLastError();
     DWORD_PTR msgArguments[3]  = { (DWORD_PTR)filename, 0, 0 };
+    DWORD error_code;
+
+    error_code = GetLastError();
 
     if (retval == SE_ERR_NOASSOC)
         LoadStringW(shell32_hInstance, IDS_SHLEXEC_NOASSOC, msg, sizeof(msg)/sizeof(WCHAR));
diff --git a/dll/win32/shell32/shlview.cpp b/dll/win32/shell32/shlview.cpp
index 3d439ea27ad..1a7c6d9e914 100644
--- a/dll/win32/shell32/shlview.cpp
+++ b/dll/win32/shell32/shlview.cpp
@@ -200,6 +200,7 @@ public:
 	LRESULT OnGetDlgCode(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
 	LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
 	LRESULT OnEraseBackground(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
+	LRESULT OnSysColorChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
 	LRESULT OnGetShellBrowser(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
 	LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
 	LRESULT OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
@@ -258,6 +259,7 @@ BEGIN_MSG_MAP(CDefView)
 	MESSAGE_HANDLER(WM_GETDLGCODE, OnGetDlgCode)
 	MESSAGE_HANDLER(WM_DESTROY, OnDestroy)
 	MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground)
+	MESSAGE_HANDLER(WM_SYSCOLORCHANGE, OnSysColorChange)
 	MESSAGE_HANDLER(CWM_GETISHELLBROWSER, OnGetShellBrowser)
 END_MSG_MAP()
 
@@ -854,6 +856,12 @@ LRESULT CDefView::OnEraseBackground(UINT uMsg, WPARAM wParam, LPARAM lParam, BOO
 	return 0;
 }
 
+LRESULT CDefView::OnSysColorChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
+{
+	/* Forward WM_SYSCOLORCHANGE to common controls */
+	return SendMessageW(hWndList, uMsg, 0, 0);
+}
+
 LRESULT CDefView::OnGetShellBrowser(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
 {
 	return (LRESULT)pShellBrowser.p;