diff --git a/clients/modernsystem/modernsys.cpp b/clients/modernsystem/modernsys.cpp
index d2da9c98c0..04eec898bc 100644
--- a/clients/modernsystem/modernsys.cpp
+++ b/clients/modernsystem/modernsys.cpp
@@ -4,21 +4,14 @@
 
 #include <kconfig.h>
 #include <kglobal.h>
-#include <qstring.h>
-#include "modernsys.h"
-#include <qapplication.h>
-#include <qcursor.h>
-#include <qabstractlayout.h>
 #include <qlayout.h>
-#include <qtoolbutton.h>
-#include <qlabel.h>
 #include <qdrawutil.h>
 #include <kpixmapeffect.h>
 #include <kdrawutil.h>
-#include <kapp.h>
 #include <qbitmap.h>
 #include "../../workspace.h"
 #include "../../options.h"
+#include "modernsys.h"
 
 #include "buttondata.h"
 #include "btnhighcolor.h"
@@ -26,7 +19,6 @@
 using namespace KWinInternal;
 
 
-
 static unsigned char iconify_bits[] = {
     0x00, 0x00, 0xff, 0xff, 0x7e, 0x3c, 0x18, 0x00};
 
@@ -355,11 +347,11 @@ ModernSys::ModernSys( Workspace *ws, WId w, QWidget *parent,
             hb->addWidget(button[BtnSticky]);
             button[BtnSticky]->show();
         }
-        else if (c == 'I') {
+        else if (c == 'I' && isMinimizable()) {
             hb->addWidget(button[BtnMinimize]);
             button[BtnMinimize]->show();
         }
-        else if (c == 'A') {
+        else if (c == 'A' && isMaximizable()) {
             hb->addWidget(button[BtnMaximize]);
             button[BtnMaximize]->show();
         }