--- a/laf-utils/src/main/java/com/redhat/thermostat/internal/utils/laf/ThemeManager.java	Wed Jun 15 12:08:57 2016 +0200
+++ b/laf-utils/src/main/java/com/redhat/thermostat/internal/utils/laf/ThemeManager.java	Wed Jun 15 12:08:58 2016 +0200
@@ -41,6 +41,7 @@
 import java.util.logging.Logger;
 
 import javax.swing.JPopupMenu;
+import javax.swing.RepaintManager;
 import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
@@ -162,6 +163,8 @@
             color = UIManager.getDefaults().getColor("control");
             UIManager.put("thermostat-bg-color", color);
         }
+
+        RepaintManager.setCurrentManager(new ThermostatRepaintManager());
     }
 }
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/laf-utils/src/main/java/com/redhat/thermostat/internal/utils/laf/ThermostatRepaintManager.java	Wed Jun 15 12:08:58 2016 +0200
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2012-2016 Red Hat, Inc.
+ *
+ * This file is part of Thermostat.
+ *
+ * Thermostat is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2, or (at your
+ * option) any later version.
+ *
+ * Thermostat is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Thermostat; see the file COPYING.  If not see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Linking this code with other modules is making a combined work
+ * based on this code.  Thus, the terms and conditions of the GNU
+ * General Public License cover the whole combination.
+ *
+ * As a special exception, the copyright holders of this code give
+ * you permission to link this code with independent modules to
+ * produce an executable, regardless of the license terms of these
+ * independent modules, and to copy and distribute the resulting
+ * executable under terms of your choice, provided that you also
+ * meet, for each linked independent module, the terms and conditions
+ * of the license of that module.  An independent module is a module
+ * which is not derived from or based on this code.  If you modify
+ * this code, you may extend this exception to your version of the
+ * library, but you are not obligated to do so.  If you do not wish
+ * to do so, delete this exception statement from your version.
+ */
+
+package com.redhat.thermostat.internal.utils.laf;
+
+import javax.swing.JComponent;
+import javax.swing.RepaintManager;
+import java.awt.Container;
+
+/**
+ */
+public class ThermostatRepaintManager extends RepaintManager {
+    @Override
+    public void addDirtyRegion(JComponent c, int x, int y, int w, int h) {
+
+        // we search the highest common ancestor who can overlap
+        // children and repaint that
+        JComponent topLevel = null;
+        Container parent = c.getParent();
+
+        while (parent instanceof JComponent) {
+            if (!parent.isVisible()) {
+                return;
+            }
+
+            if (!((JComponent) parent).isOptimizedDrawingEnabled()) {
+                topLevel = (JComponent) parent;
+            }
+
+            parent = parent.getParent();
+        }
+
+        if (topLevel == null) {
+            super.addDirtyRegion(c, x, y, w, h);
+
+        } else {
+            super.addDirtyRegion(topLevel, 0, 0, topLevel.getWidth(), topLevel.getHeight());
+        }
+    }
+}