diff --git a/clients/oxygen/oxygenclient.cpp b/clients/oxygen/oxygenclient.cpp
index 03aa69369c..74e4b3aa4d 100644
--- a/clients/oxygen/oxygenclient.cpp
+++ b/clients/oxygen/oxygenclient.cpp
@@ -594,6 +594,11 @@ namespace Oxygen
                 height -= 3;
             }
 
+            // background pixmap
+            QPoint backgroundPixmapOffset( layoutMetric( LM_OuterPaddingLeft ) + layoutMetric( LM_BorderLeft ), 0 );
+            if( isMaximized() ) backgroundPixmapOffset += QPoint( 0, 3 );
+            helper().setBackgroundPixmapOffset( backgroundPixmapOffset );
+
             const QWidget* window( isPreview() ? this->widget() : widget->window() );
             helper().renderWindowBackground(painter, rect, widget, window, palette, offset, height );
 
diff --git a/clients/oxygen/oxygenfactory.cpp b/clients/oxygen/oxygenfactory.cpp
index 6a9d213a0f..3300228b2c 100644
--- a/clients/oxygen/oxygenfactory.cpp
+++ b/clients/oxygen/oxygenfactory.cpp
@@ -132,8 +132,6 @@ namespace Oxygen
 
         // read shadowCache configuration
         changed |= shadowCache().readConfig( config );
-        if( changed )
-        { helper().setBackgroundPixmapOffset( QPoint( shadowCache().shadowSize(), 0 ) ); }
 
         // background pixmap
         {