diff --git a/clients/oxygen/oxygenclient.cpp b/clients/oxygen/oxygenclient.cpp
index a0bb9820ad..92d092d333 100644
--- a/clients/oxygen/oxygenclient.cpp
+++ b/clients/oxygen/oxygenclient.cpp
@@ -573,7 +573,8 @@ namespace Oxygen
     } else {
 
       int offset = layoutMetric( LM_OuterPaddingTop );
-      int height = 64 + configuration().buttonSize() - OxygenConfiguration::ButtonDefault;
+      int height = 64 - OxygenConfiguration::ButtonDefault;
+      if( !configuration().hideTitleBar() ) height += configuration().buttonSize();
       const QWidget* window( isPreview() ? OxygenClient::widget() : widget->window() );
       helper().renderWindowBackground(painter, rect, widget, window, palette, offset, height );