diff --git a/linphone-app/src/app/App.cpp b/linphone-app/src/app/App.cpp
index 5d8222e77..d24d02437 100644
--- a/linphone-app/src/app/App.cpp
+++ b/linphone-app/src/app/App.cpp
@@ -460,6 +460,10 @@ bool App::event (QEvent *event) {
 		}
 		
 		Cli::executeCommand(url);
+	}else if(event->type() == QEvent::ApplicationStateChange){
+		auto state = static_cast<QApplicationStateChangeEvent*>(event);
+		if( state->applicationState() == Qt::ApplicationActive)
+			smartShowWindow(getMainWindow());
 	}
 	
 	return SingleApplication::event(event);
diff --git a/linphone-app/ui/views/App/Main/MainWindow.js b/linphone-app/ui/views/App/Main/MainWindow.js
index 4b6487ce8..187a45e16 100644
--- a/linphone-app/ui/views/App/Main/MainWindow.js
+++ b/linphone-app/ui/views/App/Main/MainWindow.js
@@ -41,11 +41,6 @@ function handleClosing (close) {
     Qt.quit()
     return
   }
-
-  if (Qt.platform.os === 'osx') {
-    close.accepted = false
-    window.showMinimized()
-  }
 }
 
 // -----------------------------------------------------------------------------