diff --git a/app/main.js b/app/main.js
index e1995c5..e09efef 100644
--- a/app/main.js
+++ b/app/main.js
@@ -3,6 +3,7 @@
  */
 
 var fs = require('fs');
+var os = require('os');
 var electron = require('electron');
 
 var app = electron.app;
@@ -17,13 +18,34 @@ var mainWindow = null;
 
 var appArgs = JSON.parse(fs.readFileSync(APP_ARGS_FILE_PATH, 'utf8'));
 
-app.on('window-all-closed', function() {
-    if (process.platform != 'darwin') {
+app.on('window-all-closed', function () {
+    if (!isOSX()) {
         app.quit();
     }
 });
 
-app.on('ready', function() {
+app.on('activate', function (event, hasVisibleWindows) {
+    if (isOSX()) {
+        // this is called when the dock is clicked
+        if (!hasVisibleWindows) {
+            mainWindow.show();
+        }
+    }
+});
+
+app.on('before-quit', () => {
+    // not fired when the close button on the window is clicked
+    if (isOSX()) {
+        // need to force a quit as a workaround here to simulate the osx app hiding behaviour
+        // Somehow sokution at https://github.com/atom/electron/issues/444#issuecomment-76492576 does not work,
+        // e.prevent default appears to persist
+
+        // might cause issues in the future as before-quit and will-quit events are not called
+        app.exit(0);
+    }
+});
+
+app.on('ready', function () {
     mainWindow = new BrowserWindow(
         {
             width: appArgs.width || 1280,
@@ -37,34 +59,37 @@ app.on('ready', function() {
 
     buildMenu(app, mainWindow);
 
-
     mainWindow.loadURL('file://' + __dirname + '/index.html');
 
-    mainWindow.webContents.on('did-finish-load', function() {
+    mainWindow.webContents.on('did-finish-load', function () {
         mainWindow.webContents.send('params', JSON.stringify(appArgs));
     });
 
     // if the window is focused, clear the badge
     mainWindow.on('focus', function () {
-        if (process.platform === 'darwin') {
+        if (isOSX()) {
             app.dock.setBadge('');
         }
     });
 
-    mainWindow.on('closed', function() {
-        mainWindow = null;
+    mainWindow.on('close', (e) => {
+        if (isOSX()) {
+            // this is called when exiting from clicking the cross button on the window
+            e.preventDefault();
+            mainWindow.hide();
+        }
     });
 });
 
 // listen for a notification message
-ipc.on('notification-message', function(event, arg) {
+ipc.on('notification-message', function (event, arg) {
     if (arg === 'TITLE_CHANGED') {
-        if (process.platform === 'darwin' && !mainWindow.isFocused()) {
+        if (isOSX() && !mainWindow.isFocused()) {
             app.dock.setBadge('●');
         }
     }
 });
 
-app.on('window-all-closed', function() {
-    app.quit();
-});
+function isOSX() {
+    return os.platform() === 'darwin';
+}