2 files changed, 6 insertions, 0 deletions
diff --git a/src/leap/app.py b/src/leap/app.py
index 334b58c8..7b8ac3cd 100644
--- a/src/leap/app.py
+++ b/src/leap/app.py
@@ -108,6 +108,8 @@ def main():
         # if not, it will be set visible
         # from the systray menu.
         window.show()
+        if sys.platform == "darwin":
+            window.raise_()
 
     # run main loop
     sys.exit(app.exec_())
diff --git a/src/leap/baseapp/systray.py b/src/leap/baseapp/systray.py
index 0dd0f195..93fab716 100644
--- a/src/leap/baseapp/systray.py
+++ b/src/leap/baseapp/systray.py
@@ -1,4 +1,6 @@
 import logging
+import sys
+
 import sip
 sip.setapi('QString', 2)
 sip.setapi('QVariant', 2)
@@ -156,6 +158,8 @@ class StatusAwareTrayIconMixin(object):
             self.hide()
         else:
             self.show()
+            if sys.platform == "darwin":
+                self.raise_()
 
     def about(self):
         # move to widget