diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index facff7e0..79cee751 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -263,6 +263,7 @@ void MainWindow::createTrayIcon()
 
     m_pTrayIcon = new QSystemTrayIcon(this);
     m_pTrayIcon->setContextMenu(m_pTrayIconMenu);
+    m_pTrayIcon->setToolTip("Synergy");
 
     connect(m_pTrayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
             this, SLOT(trayActivated(QSystemTrayIcon::ActivationReason)));
@@ -359,7 +360,6 @@ void MainWindow::setIcon(qSynergyState state)
 
 void MainWindow::trayActivated(QSystemTrayIcon::ActivationReason reason)
 {
-#ifndef Q_OS_WIN
     if (reason == QSystemTrayIcon::DoubleClick)
     {
         if (isVisible())
@@ -372,7 +372,6 @@ void MainWindow::trayActivated(QSystemTrayIcon::ActivationReason reason)
             activateWindow();
         }
     }
-#endif
 }
 
 void MainWindow::logOutput()