diff --git a/src/tomahawk/TomahawkApp.cpp b/src/tomahawk/TomahawkApp.cpp
index 7d051a47e..b3423381f 100644
--- a/src/tomahawk/TomahawkApp.cpp
+++ b/src/tomahawk/TomahawkApp.cpp
@@ -172,7 +172,10 @@ TomahawkApp::init()
     m_headless = true;
     m_headless = arguments().contains( "--headless" );
     setWindowIcon( QIcon( RESPATH "icons/tomahawk-icon-128x128.png" ) );
+
+#ifndef Q_OS_MAC
     setQuitOnLastWindowClosed( false );
+#endif
 
     if ( arguments().contains( "--splash" ) )
     {
diff --git a/src/tomahawk/TomahawkWindow.cpp b/src/tomahawk/TomahawkWindow.cpp
index 97b7d4385..1d2475eed 100644
--- a/src/tomahawk/TomahawkWindow.cpp
+++ b/src/tomahawk/TomahawkWindow.cpp
@@ -751,14 +751,9 @@ TomahawkWindow::closeEvent( QCloseEvent* e )
         e->ignore();
         return;
     }
-#else
-    if ( m_trayIcon )
-    {
-        m_trayIcon->setShowHideWindow( false );
-    }
 #endif
 
-    e->accept();
+    QMainWindow::closeEvent( e );
 }