diff --git a/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp b/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp
index ebd56155f..091cb8e07 100644
--- a/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp
+++ b/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp
@@ -815,16 +815,14 @@ void ProjectPanel::notified(LPNMHDR notification)
 	}
 	else if (notification->code == NM_CUSTOMDRAW && (notification->hwndFrom == _hToolbarMenu))
 	{
-		static bool becomeDarkMode = false;
-		static bool becomeLightMode = false;
 		if (NppDarkMode::isEnabled())
 		{
-			if (!becomeDarkMode)
+			if (!_becomeDarkMode)
 			{
 				NppDarkMode::setExplorerTheme(_hToolbarMenu, false);
-				becomeDarkMode = true;
+				_becomeDarkMode = true;
 			}
-			becomeLightMode = false;
+			_becomeLightMode = false;
 			auto nmtbcd = reinterpret_cast<LPNMTBCUSTOMDRAW>(notification);
 			FillRect(nmtbcd->nmcd.hdc, &nmtbcd->nmcd.rc, NppDarkMode::getBackgroundBrush());
 			nmtbcd->clrText = NppDarkMode::getTextColor();
@@ -833,12 +831,12 @@ void ProjectPanel::notified(LPNMHDR notification)
 		}
 		else
 		{
-			if (!becomeLightMode)
+			if (!_becomeLightMode)
 			{
 				NppDarkMode::setExplorerTheme(_hToolbarMenu, true);
-				becomeLightMode = true;
+				_becomeLightMode = true;
 			}
-			becomeDarkMode = false;
+			_becomeDarkMode = false;
 			SetWindowLongPtr(_hSelf, DWLP_MSGRESULT, CDRF_DODEFAULT);
 		}
 	}
diff --git a/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.h b/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.h
index 479659b7e..707839c59 100644
--- a/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.h
+++ b/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.h
@@ -117,6 +117,8 @@ protected:
 	generic_string _selDirOfFilesFromDirDlg;
 	bool _isDirty = false;
 	int _panelID = 0;
+	bool _becomeDarkMode = false;
+	bool _becomeLightMode = false;
 
 	void initMenus();
 	void destroyMenus();