diff --git a/linphone-desktop/src/app/Logger.hpp b/linphone-desktop/src/app/Logger.hpp
index b74a9a119..e08490be8 100644
--- a/linphone-desktop/src/app/Logger.hpp
+++ b/linphone-desktop/src/app/Logger.hpp
@@ -30,7 +30,7 @@
 class Logger {
 public:
   static void init ();
-  static Logger * instance () { return m_instance; };
+  static Logger *instance () { return m_instance; };
 
   bool isVerbose () const { return m_verbose; };
   void setVerbose (bool verbose) { m_verbose = verbose; };
diff --git a/linphone-desktop/ui/modules/Linphone/Notifications/NotificationReceivedFileMessage.qml b/linphone-desktop/ui/modules/Linphone/Notifications/NotificationReceivedFileMessage.qml
index 2651ef2f8..5213f15f8 100644
--- a/linphone-desktop/ui/modules/Linphone/Notifications/NotificationReceivedFileMessage.qml
+++ b/linphone-desktop/ui/modules/Linphone/Notifications/NotificationReceivedFileMessage.qml
@@ -13,7 +13,7 @@ Notification {
 
   // ---------------------------------------------------------------------------
 
-  property string _fileUri: notificationData ? notificationData.fileUri : ''
+  property string _fileUri: notificationData && notificationData.fileUri || ''
 
   // ---------------------------------------------------------------------------
 
diff --git a/linphone-desktop/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml b/linphone-desktop/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml
index 952ceb886..b489cf28a 100644
--- a/linphone-desktop/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml
+++ b/linphone-desktop/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml
@@ -12,7 +12,7 @@ Notification {
 
   // ---------------------------------------------------------------------------
 
-  property string _sipAddress: notificationData ? notificationData.sipAddress : ''
+  property string _sipAddress: notificationData && notificationData.sipAddress || ''
   property var _contact: _contactObserver.contact
   property var _contactObserver: SipAddressesModel.getContactObserver(_sipAddress)
 
diff --git a/linphone-desktop/ui/views/App/Main/MainWindow.qml b/linphone-desktop/ui/views/App/Main/MainWindow.qml
index 50892ca2e..7c6c307e5 100644
--- a/linphone-desktop/ui/views/App/Main/MainWindow.qml
+++ b/linphone-desktop/ui/views/App/Main/MainWindow.qml
@@ -1,6 +1,7 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.3
+import QtQuick.Window 2.2
 
 // Explicit import to support Toolbar.
 import QtQuick.Controls 1.4 as Controls1
@@ -65,7 +66,12 @@ Controls1.ApplicationWindow {
   }
 
   function _setView (view, props) {
-    window.show()
+    if (window.visibility === Window.Minimized) {
+      window.visibility = Window.AutomaticVisibility
+    } else {
+      window.setVisible(true)
+    }
+
     window.requestActivate()
     collapse.setCollapsed(true)