diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java b/platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java
index 92dc879bcf1d..6d4287376062 100644
--- a/platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java
+++ b/platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java
@@ -64,6 +64,7 @@ public class BranchActionGroupPopup extends FlatSpeedSearchPopup {
                                 @Nullable String dimensionKey) {
     super(title, createBranchSpeedSearchActionGroup(actions), SimpleDataContext.getProjectContext(project),
           preselectActionCondition, true);
+    getTitle().setBackground(JBColor.PanelBackground);
     myProject = project;
     DataManager.registerDataProvider(getList(), dataId -> POPUP_MODEL.is(dataId) ? getListModel() : null);
     myKey = dimensionKey;
diff --git a/platform/util/ui/src/com/intellij/ui/CaptionPanel.java b/platform/util/ui/src/com/intellij/ui/CaptionPanel.java
index 6e2be97b94de..938906fac338 100644
--- a/platform/util/ui/src/com/intellij/ui/CaptionPanel.java
+++ b/platform/util/ui/src/com/intellij/ui/CaptionPanel.java
@@ -24,6 +24,7 @@ public class CaptionPanel extends JPanel {
 
   public CaptionPanel() {
     setLayout(new BorderLayout());
+    setBackground(null);
   }
 
   @Override
@@ -31,8 +32,11 @@ public class CaptionPanel extends JPanel {
     super.paintComponent(g);
 
     Graphics2D g2d = (Graphics2D) g;
-
-    g2d.setPaint(JBUI.CurrentTheme.Popup.headerBackground(myActive));
+    Color background = getBackground();
+    if (background == null) {
+      background = JBUI.CurrentTheme.Popup.headerBackground(myActive);
+    }
+    g2d.setColor(background);
     g2d.fillRect(0, 0, getWidth(), getHeight());
   }