diff --git a/clients/oxygen/config/oxygenconfig.cpp b/clients/oxygen/config/oxygenconfig.cpp
index 8033f62fe3..aac10f373a 100644
--- a/clients/oxygen/config/oxygenconfig.cpp
+++ b/clients/oxygen/config/oxygenconfig.cpp
@@ -157,6 +157,7 @@ namespace Oxygen
         configuration.setUseDropShadows( ui->shadowConfigurations[1]->isChecked() );
         configuration.setUseOxygenShadows( ui->shadowConfigurations[0]->isChecked() );
         configuration.setUseNarrowButtonSpacing( ui->ui.narrowButtonSpacing->isChecked() );
+        configuration.setCloseFromMenuButton( ui->ui.closeFromMenuButton->isChecked() );
 
         if( ui->expertMode() )
         {
@@ -246,6 +247,7 @@ namespace Oxygen
         ui->shadowConfigurations[1]->setChecked( configuration.useDropShadows() );
         ui->ui.animationsEnabled->setChecked( configuration.animationsEnabled() );
         ui->ui.narrowButtonSpacing->setChecked( configuration.useNarrowButtonSpacing() );
+        ui->ui.closeFromMenuButton->setChecked( configuration.closeFromMenuButton() );
 
         ui->animationConfigWidget()->setConfiguration( configuration );
         ui->animationConfigWidget()->load();
diff --git a/clients/oxygen/config/ui/oxygenconfigurationui.ui b/clients/oxygen/config/ui/oxygenconfigurationui.ui
index 0943bfe328..3dbc581012 100644
--- a/clients/oxygen/config/ui/oxygenconfigurationui.ui
+++ b/clients/oxygen/config/ui/oxygenconfigurationui.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>500</width>
-    <height>378</height>
+    <width>538</width>
+    <height>388</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -124,6 +124,19 @@
        <property name="margin">
         <number>4</number>
        </property>
+       <item row="2" column="0">
+        <widget class="QLabel" name="label_5">
+         <property name="text">
+          <string>Separator display:</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+         <property name="buddy">
+          <cstring>separatorMode</cstring>
+         </property>
+        </widget>
+       </item>
        <item row="0" column="0">
         <widget class="QLabel" name="label_4">
          <property name="text">
@@ -160,14 +173,7 @@
          </property>
         </widget>
        </item>
-       <item row="5" column="0" colspan="3">
-        <widget class="QCheckBox" name="narrowButtonSpacing">
-         <property name="text">
-          <string>Use narrow space between decoration buttons</string>
-         </property>
-        </widget>
-       </item>
-       <item row="6" column="0">
+       <item row="7" column="0">
         <spacer name="verticalSpacer_2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -180,6 +186,13 @@
          </property>
         </spacer>
        </item>
+       <item row="6" column="0" colspan="3">
+        <widget class="QCheckBox" name="narrowButtonSpacing">
+         <property name="text">
+          <string>Use narrow space between decoration buttons</string>
+         </property>
+        </widget>
+       </item>
        <item row="1" column="1">
         <widget class="KComboBox" name="sizeGripMode"/>
        </item>
@@ -215,16 +228,10 @@
          </item>
         </widget>
        </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="label_5">
+       <item row="5" column="0" colspan="3">
+        <widget class="QCheckBox" name="closeFromMenuButton">
          <property name="text">
-          <string>Separator display:</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-         </property>
-         <property name="buddy">
-          <cstring>separatorMode</cstring>
+          <string>Close windows by double clicking the menu button</string>
          </property>
         </widget>
        </item>
@@ -347,6 +354,7 @@
   <tabstop>sizeGripMode</tabstop>
   <tabstop>separatorMode</tabstop>
   <tabstop>titleOutline</tabstop>
+  <tabstop>closeFromMenuButton</tabstop>
   <tabstop>narrowButtonSpacing</tabstop>
   <tabstop>inactiveShadowConfiguration</tabstop>
   <tabstop>activeShadowConfiguration</tabstop>