diff --git a/src/dialogs/SettingsDlg.cpp b/src/dialogs/SettingsDlg.cpp
index 584e944..f63284f 100644
--- a/src/dialogs/SettingsDlg.cpp
+++ b/src/dialogs/SettingsDlg.cpp
@@ -69,6 +69,9 @@ CSettingsDlg::CSettingsDlg(QWidget* parent):QDialog(parent,Qt::Dialog)
 	Edit_GlobalShortcut->setVisible(false);
 	CheckBox_EntryTitlesMatch->setVisible(false);
 #endif
+#ifdef Q_WS_MAC
+	CheckBox_AlwaysOnTop->setVisible(false);
+#endif
 	
 #ifdef GLOBAL_AUTOTYPE
 	pShortcut = autoType->getShortcut();
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index b4075d8..abe46b6 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -84,8 +84,10 @@ KeepassMainWindow::KeepassMainWindow(const QString& ArgFile,bool ArgMin,bool Arg
 	//statusBar()->addWidget(StatusBarSelection,85);
 	statusBar()->setVisible(config->showStatusbar());
 	setStatusBarMsg(StatusBarReady);
+#ifndef Q_WS_MAC
 	if (config->alwaysOnTop())
 		setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
+#endif
 
 	NormalCentralWidget=QMainWindow::centralWidget();
 	LockedCentralWidget=new QWidget(this);
@@ -1133,6 +1135,7 @@ void KeepassMainWindow::OnExtrasSettings(){
 	EntryView->setAlternatingRowColors(config->alternatingRowColors());
 	SysTray->setVisible(config->showSysTrayIcon());
 	menuBookmarks->menuAction()->setVisible(config->featureBookmarks());
+#ifndef Q_WS_MAC
 	if (config->alwaysOnTop() != oldAlwaysOnTop) {
 		if (config->alwaysOnTop())
 			setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
@@ -1140,6 +1143,7 @@ void KeepassMainWindow::OnExtrasSettings(){
 			setWindowFlags(windowFlags() & ~Qt::WindowStaysOnTopHint);
 		show();
 	}
+#endif
 	
 	EventOccurred = true;
 	if (config->lockOnInactivity() && config->lockAfterSec()!=0 && !inactivityTimer->isActive()){