diff --git a/src/serverdlg.cpp b/src/serverdlg.cpp
index 2d71da7ab1..faf4862e4d 100644
--- a/src/serverdlg.cpp
+++ b/src/serverdlg.cpp
@@ -593,8 +593,13 @@ void CServerDlg::OnClearRecordingDirClicked()
 
 void CServerDlg::OnSysTrayActivated ( QSystemTrayIcon::ActivationReason ActReason )
 {
-    // on double click on the icon, show window in fore ground
+    #ifdef _WIN32
+    // on single or double click on the icon, show window in foreground for windows only
+    if ( ActReason == QSystemTrayIcon::Trigger || ActReason == QSystemTrayIcon::DoubleClick )
+    #else
+    // on double click on the icon, show window in foreground for all
     if ( ActReason == QSystemTrayIcon::DoubleClick )
+    #endif
     {
         ShowWindowInForeground();
     }
diff --git a/src/serverdlg.h b/src/serverdlg.h
index af88a9cc5c..00606c126f 100644
--- a/src/serverdlg.h
+++ b/src/serverdlg.h
@@ -73,6 +73,7 @@ class CServerDlg : public CBaseDlg, private Ui_CServerDlgBase
     {
         showNormal();
         raise();
+        activateWindow();
     }
     void ModifyAutoStartEntry ( const bool bDoAutoStart );
     void UpdateRecorderStatus ( QString sessionDir );