diff --git a/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp b/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp
index d811254d..3168e634 100755
--- a/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp
+++ b/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp
@@ -26,8 +26,10 @@
 aboutPokerthImpl::aboutPokerthImpl(QWidget *parent, ConfigFile *c)
     : QDialog(parent), myConfig(c)
 {
+#ifdef __APPLE__
 	setWindowModality(Qt::ApplicationModal);
 	setWindowFlags(Qt::WindowSystemMenuHint | Qt::CustomizeWindowHint | Qt::Dialog);
+#endif	
 	setupUi(this);
 
 	myAppDataPath = QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str());
diff --git a/src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.cpp b/src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.cpp
index 774f8c64..fd225ff6 100644
--- a/src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.cpp
+++ b/src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.cpp
@@ -25,8 +25,10 @@
 changeCompleteBlindsDialogImpl::changeCompleteBlindsDialogImpl(QWidget *parent, ConfigFile *c)
     : QDialog(parent), myConfig(c), settingsCorrect(TRUE)
 {
+#ifdef __APPLE__
 	setWindowModality(Qt::ApplicationModal);
 	setWindowFlags(Qt::WindowSystemMenuHint | Qt::CustomizeWindowHint | Qt::Dialog);
+#endif	
 	setupUi(this);
 
 	connect( pushButton_add, SIGNAL( clicked() ), this, SLOT( addBlindValueToList() ) );
diff --git a/src/gui/qt/changehumanplayernamedialog/changehumanplayernamedialogimpl.cpp b/src/gui/qt/changehumanplayernamedialog/changehumanplayernamedialogimpl.cpp
index be2c37a9..5a677691 100644
--- a/src/gui/qt/changehumanplayernamedialog/changehumanplayernamedialogimpl.cpp
+++ b/src/gui/qt/changehumanplayernamedialog/changehumanplayernamedialogimpl.cpp
@@ -24,8 +24,10 @@
 changeHumanPlayerNameDialogImpl::changeHumanPlayerNameDialogImpl(QWidget *parent, ConfigFile *config)
       : QDialog(parent), myConfig(config)
 {
+#ifdef __APPLE__
 	setWindowModality(Qt::ApplicationModal);
 	setWindowFlags(Qt::WindowSystemMenuHint | Qt::CustomizeWindowHint | Qt::Dialog);
+#endif	
     	setupUi(this);
 
 	lineEdit->setText(QString::fromUtf8(myConfig->readConfigString("MyName").c_str()));
diff --git a/src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.cpp b/src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.cpp
index b2b13fa1..2828b032 100644
--- a/src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.cpp
+++ b/src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.cpp
@@ -23,8 +23,10 @@
 connectToServerDialogImpl::connectToServerDialogImpl(QWidget *parent)
       : QDialog(parent)
 {
+#ifdef __APPLE__
 	setWindowModality(Qt::ApplicationModal);
 	setWindowFlags(Qt::WindowSystemMenuHint | Qt::CustomizeWindowHint | Qt::Dialog);
+#endif	
     	setupUi(this);
 }
 
diff --git a/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp b/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp
index e5907071..8cb98129 100644
--- a/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp
+++ b/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp
@@ -26,8 +26,10 @@
 createInternetGameDialogImpl::createInternetGameDialogImpl(QWidget *parent, ConfigFile *c)
       : QDialog(parent), myConfig(c)
 {
+#ifdef __APPLE__
 	setWindowModality(Qt::ApplicationModal);
 	setWindowFlags(Qt::WindowSystemMenuHint | Qt::CustomizeWindowHint | Qt::Dialog);
+#endif	
     	setupUi(this);
 
 	myChangeCompleteBlindsDialog = new changeCompleteBlindsDialogImpl;
diff --git a/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp b/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp
index 418fb00f..b1b081fa 100644
--- a/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp
+++ b/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp
@@ -25,8 +25,10 @@
 createNetworkGameDialogImpl::createNetworkGameDialogImpl(QWidget *parent, ConfigFile *c)
       : QDialog(parent), myConfig(c)
 {
+#ifdef __APPLE__
 	setWindowModality(Qt::ApplicationModal);
 	setWindowFlags(Qt::WindowSystemMenuHint | Qt::CustomizeWindowHint | Qt::Dialog);
+#endif	
     	setupUi(this);
 	
 	myChangeCompleteBlindsDialog = new changeCompleteBlindsDialogImpl;
diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
index 5878a706..6e220073 100644
--- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
+++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
@@ -21,8 +21,10 @@ gameLobbyDialogImpl::gameLobbyDialogImpl(QWidget *parent, ConfigFile *c)
  : QDialog(parent), myW(NULL), myConfig(c), mySession(NULL), currentGameName(""), myPlayerId(0), isAdmin(false), inGame(false), myChat(NULL), keyUpCounter(0)
 {
 
+#ifdef __APPLE__
 	setWindowModality(Qt::ApplicationModal);
 	setWindowFlags(Qt::WindowSystemMenuHint | Qt::CustomizeWindowHint | Qt::Dialog);
+#endif	
     	setupUi(this);
 	
 	myChat = new LobbyChat(this, myConfig);
diff --git a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp
index 10f63801..4ebc89f6 100644
--- a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp
+++ b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp
@@ -28,9 +28,10 @@ using namespace std;
 joinNetworkGameDialogImpl::joinNetworkGameDialogImpl(QWidget *parent, ConfigFile *c)
       : QDialog(parent), myConfig(c)
 {
-
-    	setWindowModality(Qt::ApplicationModal);
+#ifdef __APPLE__
+	setWindowModality(Qt::ApplicationModal);
 	setWindowFlags(Qt::WindowSystemMenuHint | Qt::CustomizeWindowHint | Qt::Dialog);
+#endif	
 	setupUi(this);
 
 // 	QShortcut *connectKey = new QShortcut(QKeySequence(Qt::Key_Enter), this);
diff --git a/src/gui/qt/mymessagedialog/mymessagedialogimpl.cpp b/src/gui/qt/mymessagedialog/mymessagedialogimpl.cpp
index 39a403a1..5899e3de 100644
--- a/src/gui/qt/mymessagedialog/mymessagedialogimpl.cpp
+++ b/src/gui/qt/mymessagedialog/mymessagedialogimpl.cpp
@@ -23,7 +23,9 @@
 myMessageDialogImpl::myMessageDialogImpl(QWidget *parent)
     : QDialog(parent)
 {
+#ifdef __APPLE__
 	setWindowModality(Qt::ApplicationModal);
 	setWindowFlags(Qt::WindowSystemMenuHint | Qt::CustomizeWindowHint | Qt::Dialog);
+#endif	
 	setupUi(this);	
 }
diff --git a/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp b/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp
index 4a0abc17..bce9ebcf 100755
--- a/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp
+++ b/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp
@@ -24,8 +24,10 @@
 newGameDialogImpl::newGameDialogImpl(QMainWindow *parent, ConfigFile *c)
       : QDialog(parent), myConfig(c)
 {
+#ifdef __APPLE__
 	setWindowModality(Qt::ApplicationModal);
 	setWindowFlags(Qt::WindowSystemMenuHint | Qt::CustomizeWindowHint | Qt::Dialog);
+#endif	
     	setupUi(this);
 	
 	myChangeCompleteBlindsDialog = new changeCompleteBlindsDialogImpl;
diff --git a/src/gui/qt/settingsdialog/manualblindsorderdialog/manualblindsorderdialogimpl.cpp b/src/gui/qt/settingsdialog/manualblindsorderdialog/manualblindsorderdialogimpl.cpp
index 16f6f5f1..3e4e857c 100644
--- a/src/gui/qt/settingsdialog/manualblindsorderdialog/manualblindsorderdialogimpl.cpp
+++ b/src/gui/qt/settingsdialog/manualblindsorderdialog/manualblindsorderdialogimpl.cpp
@@ -25,8 +25,10 @@
 manualBlindsOrderDialogImpl::manualBlindsOrderDialogImpl(QWidget *parent, ConfigFile *c)
     : QDialog(parent), myConfig(c), settingsCorrect(TRUE)
 {
+#ifdef __APPLE__
 	setWindowModality(Qt::ApplicationModal);
 	setWindowFlags(Qt::WindowSystemMenuHint | Qt::CustomizeWindowHint | Qt::Dialog);
+#endif	
 	setupUi(this);
 
 	connect( pushButton_add, SIGNAL( clicked() ), this, SLOT( addBlindValueToList() ) );
diff --git a/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp b/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp
index 4ab43456..08895a0b 100644
--- a/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp
+++ b/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp
@@ -26,8 +26,10 @@
 selectAvatarDialogImpl::selectAvatarDialogImpl(QWidget *parent, ConfigFile *c)
     : QDialog(parent), myConfig(c), settingsCorrect(TRUE), avatarDir("")
 {
+#ifdef __APPLE__
 	setWindowModality(Qt::ApplicationModal);
 	setWindowFlags(Qt::WindowSystemMenuHint | Qt::CustomizeWindowHint | Qt::Dialog);
+#endif	
 	setupUi(this);
 	
 	myAppDataPath = QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str());
diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
index 5d998be7..898e49e5 100644
--- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
+++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
@@ -29,8 +29,10 @@ using namespace std;
 settingsDialogImpl::settingsDialogImpl(QWidget *parent, ConfigFile *c, selectAvatarDialogImpl *s)
     : QDialog(parent), myConfig(c), mySelectAvatarDialogImpl(s)
 {
+#ifdef __APPLE__
 	setWindowModality(Qt::ApplicationModal);
 	setWindowFlags(Qt::WindowSystemMenuHint | Qt::CustomizeWindowHint | Qt::Dialog);
+#endif	
   	setupUi(this);
 
 	myManualBlindsOrderDialog = new manualBlindsOrderDialogImpl; 	
diff --git a/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp b/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp
index 43ef155b..3819cfdc 100644
--- a/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp
+++ b/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp
@@ -26,9 +26,10 @@
 startNetworkGameDialogImpl::startNetworkGameDialogImpl(QWidget *parent, ConfigFile *config)
       : QDialog(parent), myW(NULL), keyUpDownChatCounter(0), myPlayerId(0), isAdmin(false), myConfig(config), mySession(NULL), myChat(NULL)
 {
-
+#ifdef __APPLE__
 	setWindowModality(Qt::ApplicationModal);
 	setWindowFlags(Qt::WindowSystemMenuHint | Qt::CustomizeWindowHint | Qt::Dialog);
+#endif	
 	setupUi(this);
 
 	myChat = new ChatTools(lineEdit_ChatInput, myConfig, 1, textBrowser_ChatDisplay, treeWidget );