diff --git a/app/src/processing/app/ui/Editor.java b/app/src/processing/app/ui/Editor.java
index 7f4f9c20b..59ba736d1 100644
--- a/app/src/processing/app/ui/Editor.java
+++ b/app/src/processing/app/ui/Editor.java
@@ -48,6 +48,7 @@
 import javax.swing.text.html.*;
 import javax.swing.undo.*;
 
+import com.formdev.flatlaf.FlatLaf;
 import com.formdev.flatlaf.util.SystemInfo;
 import processing.app.Base;
 import processing.app.Formatter;
@@ -594,6 +595,13 @@ public void updateTheme() {
     toolTipWarningColor = Theme.get("errors.selection.warning.bgcolor");
     toolTipErrorColor = Theme.get("errors.selection.error.bgcolor");
 
+    if(Platform.isWindows()) {
+      UIManager.put("RootPane.background", color);
+      UIManager.put("TitlePane.embeddedForeground", Theme.getColor("editor.fgcolor"));
+      getRootPane().updateUI();
+      UIManager.put("RootPane.background", null);
+    }
+
     JPopupMenu popup = modePopup.getPopupMenu();
     // Cannot use instanceof because com.formdev.flatlaf.ui.FlatPopupMenuBorder
     // is a subclass of EmptyBorder, so just override each time. Cannot set