diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index c55f36a4..cf9226f9 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -85,7 +85,8 @@ MainWindow::MainWindow(QSettings& settings, AppConfig& appConfig) :
 	m_pZeroconfService(NULL),
 	m_pDataDownloader(NULL),
 	m_DownloadMessageBox(NULL),
-	m_pCancelButton(NULL)
+	m_pCancelButton(NULL),
+	m_SuppressAutoConnectWarning(false)
 {
 	setupUi(this);
 
@@ -115,7 +116,9 @@ MainWindow::MainWindow(QSettings& settings, AppConfig& appConfig) :
 	setMinimumSize(size());
 #endif
 
+	m_SuppressAutoConnectWarning = true;
 	m_pCheckBoxAutoConnect->setChecked(appConfig.autoConnect());
+	m_SuppressAutoConnectWarning = false;
 
 	m_pComboServerList->hide();
 }
@@ -970,7 +973,7 @@ void MainWindow::on_m_pButtonApply_clicked()
 
 void MainWindow::on_m_pCheckBoxAutoConnect_toggled(bool checked)
 {
-	if (!isBonjourRunning() && checked) {
+	if (!isBonjourRunning() && checked && !m_SuppressAutoConnectWarning) {
 		int r = QMessageBox::information(
 			this, tr("Synergy"),
 			tr("Auto connect feature requires Bonjour.\n\n"
diff --git a/src/gui/src/MainWindow.h b/src/gui/src/MainWindow.h
index 0fb31000..b3692343 100644
--- a/src/gui/src/MainWindow.h
+++ b/src/gui/src/MainWindow.h
@@ -187,6 +187,7 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase
 		QMessageBox* m_DownloadMessageBox;
 		QAbstractButton* m_pCancelButton;
 		QMutex m_Mutex;
+		bool m_SuppressAutoConnectWarning;
 
 private slots:
 	void on_m_pComboServerList_currentIndexChanged(QString );