1 files changed, 9 insertions, 1 deletions
diff --git a/src/gui/widgets/basiccontainer2.cpp b/src/gui/widgets/basiccontainer2.cpp
index 4a4184f2c..11fca50b3 100644
--- a/src/gui/widgets/basiccontainer2.cpp
+++ b/src/gui/widgets/basiccontainer2.cpp
@@ -94,7 +94,15 @@ void BasicContainer2::draw(Graphics* graphics)
 
 void BasicContainer2::safeDraw(Graphics* graphics)
 {
-    BasicContainer2::draw(graphics);
+    BLOCK_START("BasicContainer2::draw")
+    if (isOpaque())
+    {
+        graphics->setColor(getBaseColor());
+        graphics->fillRectangle(Rect(0, 0, getWidth(), getHeight()));
+    }
+
+    safeDrawChildren(graphics);
+    BLOCK_END("BasicContainer2::draw")
 }
 
 void BasicContainer2::setOpaque(bool opaque)