diff --git a/clients/oxygen/config/oxygenconfigwidget.cpp b/clients/oxygen/config/oxygenconfigwidget.cpp
index e36212d55e..261bf510a0 100644
--- a/clients/oxygen/config/oxygenconfigwidget.cpp
+++ b/clients/oxygen/config/oxygenconfigwidget.cpp
@@ -77,6 +77,7 @@ namespace Oxygen
         connect( ui.narrowButtonSpacing, SIGNAL(clicked()), SLOT(updateChanged()) );
         connect( ui.closeFromMenuButton, SIGNAL(clicked()), SLOT(updateChanged()) );
         connect( ui.separatorMode, SIGNAL(currentIndexChanged(int)), SLOT(updateChanged()) );
+        connect( ui.drawBorderOnMaximizedWindows, SIGNAL(clicked()), SLOT(updateChanged()) );
 
         // track exception changes
         connect( ui.exceptions, SIGNAL(changed(bool)), SLOT(updateChanged()) );
@@ -112,6 +113,7 @@ namespace Oxygen
         ui.animationsEnabled->setChecked( _configuration->animationsEnabled() );
         ui.narrowButtonSpacing->setChecked( _configuration->useNarrowButtonSpacing() );
         ui.closeFromMenuButton->setChecked( _configuration->closeWindowFromMenuButton() );
+        ui.drawBorderOnMaximizedWindows->setChecked( _configuration->drawBorderOnMaximizedWindows() );
         setChanged( false );
 
         _animationConfigWidget->load();
@@ -134,7 +136,7 @@ namespace Oxygen
         _configuration->setDrawTitleOutline( ui.titleOutline->isChecked() );
         _configuration->setUseNarrowButtonSpacing( ui.narrowButtonSpacing->isChecked() );
         _configuration->setCloseWindowFromMenuButton( ui.closeFromMenuButton->isChecked() );
-
+        _configuration->setDrawBorderOnMaximizedWindows( ui.drawBorderOnMaximizedWindows->isChecked() );
         setChanged( false );
 
         if( _expertMode ) _animationConfigWidget->save();
@@ -235,6 +237,7 @@ namespace Oxygen
         else if( ui.titleOutline->isChecked() !=  _configuration->drawTitleOutline() ) modified = true;
         else if( ui.narrowButtonSpacing->isChecked() !=  _configuration->useNarrowButtonSpacing() ) modified = true;
         else if( ui.closeFromMenuButton->isChecked() != _configuration->closeWindowFromMenuButton() ) modified = true;
+        else if( ui.drawBorderOnMaximizedWindows->isChecked() != _configuration->drawBorderOnMaximizedWindows() ) modified = true;
 
         // exceptions
         else if( ui.exceptions->isChanged() ) modified = true;
diff --git a/clients/oxygen/config/ui/oxygenconfigurationui.ui b/clients/oxygen/config/ui/oxygenconfigurationui.ui
index 41c94a119a..d836351d91 100644
--- a/clients/oxygen/config/ui/oxygenconfigurationui.ui
+++ b/clients/oxygen/config/ui/oxygenconfigurationui.ui
@@ -217,6 +217,13 @@
        <property name="margin">
         <number>4</number>
        </property>
+       <item row="6" column="0" colspan="3">
+        <widget class="QCheckBox" name="closeFromMenuButton">
+         <property name="text">
+          <string>Close windows by double clicking the menu button</string>
+         </property>
+        </widget>
+       </item>
        <item row="1" column="1">
         <widget class="KComboBox" name="separatorMode">
          <item>
@@ -301,6 +308,19 @@
          </property>
         </widget>
        </item>
+       <item row="10" column="0" colspan="3">
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
        <item row="8" column="0" colspan="3">
         <widget class="QCheckBox" name="narrowButtonSpacing">
          <property name="text">
@@ -315,26 +335,13 @@
          </property>
         </widget>
        </item>
-       <item row="6" column="0" colspan="3">
-        <widget class="QCheckBox" name="closeFromMenuButton">
+       <item row="9" column="0" colspan="2">
+        <widget class="QCheckBox" name="drawBorderOnMaximizedWindows">
          <property name="text">
-          <string>Close windows by double clicking the menu button</string>
+          <string>Display window borders for maximized windows</string>
          </property>
         </widget>
        </item>
-       <item row="9" column="0" colspan="3">
-        <spacer name="verticalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_3">
diff --git a/clients/oxygen/oxygenclient.h b/clients/oxygen/oxygenclient.h
index 208e8724a4..af57dc5367 100644
--- a/clients/oxygen/oxygenclient.h
+++ b/clients/oxygen/oxygenclient.h
@@ -77,7 +77,7 @@ namespace Oxygen
 
         //! true if window is maximized
         virtual bool isMaximized( void ) const
-        { return maximizeMode()==MaximizeFull && !options()->moveResizeMaximizedWindows();  }
+        { return maximizeMode()==MaximizeFull && !configuration()->drawBorderOnMaximizedWindows();  }
 
         //! true if animations are used
         bool animationsEnabled( void ) const
diff --git a/clients/oxygen/oxygenconfigdata.kcfg b/clients/oxygen/oxygenconfigdata.kcfg
index dc23224009..4542ab7350 100644
--- a/clients/oxygen/oxygenconfigdata.kcfg
+++ b/clients/oxygen/oxygenconfigdata.kcfg
@@ -83,6 +83,11 @@
        <default>true</default>
     </entry>
 
+    <!-- maximized windows -->
+    <entry name="DrawBorderOnMaximizedWindows" type = "Bool">
+       <default>false</default>
+    </entry>
+
     <!-- animations -->
     <entry name="AnimationsEnabled" type = "Bool">
        <default>true</default>