diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
index e82a0fd9d..bf7e22d9e 100644
--- a/src/slic3r/GUI/GUI_App.cpp
+++ b/src/slic3r/GUI/GUI_App.cpp
@@ -102,6 +102,8 @@
 #ifdef __WINDOWS__
 #ifdef _MSW_DARK_MODE
 #include "dark_mode.hpp"
+#include "wx/headerctrl.h"
+#include "wx/msw/headerctrl.h"
 #endif // _MSW_DARK_MODE
 #endif // __WINDOWS__
 
@@ -2801,6 +2803,14 @@ void GUI_App::UpdateDVCDarkUI(wxDataViewCtrl* dvc, bool highlited/* = false*/)
     UpdateDarkUI(dvc, highlited ? dark_mode() : false);
 #ifdef _MSW_DARK_MODE
     //dvc->RefreshHeaderDarkMode(&m_normal_font);
+    HWND hwnd = (HWND)dvc->GenericGetHeader()->GetHandle();
+    hwnd = GetWindow(hwnd, GW_CHILD);
+    if (hwnd != NULL)
+        NppDarkMode::SetDarkListViewHeader(hwnd);
+    wxItemAttr attr;
+    attr.SetTextColour(NppDarkMode::GetTextColor());
+    attr.SetFont(m_normal_font);
+    dvc->SetHeaderAttr(attr);
 #endif //_MSW_DARK_MODE
     if (dvc->HasFlag(wxDV_ROW_LINES))
         dvc->SetAlternateRowColour(m_color_highlight_default);
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index 3b5562d89..7c8839ebb 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -1208,7 +1208,7 @@ void Sidebar::sys_color_changed()
         combo->sys_color_changed();
 
     // BBS
-    //obj_list()->sys_color_changed();
+    obj_list()->sys_color_changed();
     // BBS
     //p->object_manipulation->sys_color_changed();
 
diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp
index efc765b2a..f3aeb001a 100644
--- a/src/slic3r/GUI/Preferences.cpp
+++ b/src/slic3r/GUI/Preferences.cpp
@@ -513,6 +513,8 @@ void PreferencesDialog::set_dark_mode()
     NppDarkMode::SetDarkExplorerTheme(this->GetHWND());
     NppDarkMode::SetDarkTitleBar(this->GetHWND());
     wxGetApp().UpdateDlgDarkUI(this);
+    SetActiveWindow(wxGetApp().mainframe->GetHWND());
+    SetActiveWindow(GetHWND());
 #endif
 #endif
 }