diff --git a/linphone-desktop/assets/languages/en.ts b/linphone-desktop/assets/languages/en.ts
index d91c720a7..2798b9362 100644
--- a/linphone-desktop/assets/languages/en.ts
+++ b/linphone-desktop/assets/languages/en.ts
@@ -429,6 +429,10 @@ Server url not configured.</translation>
         <source>confirm</source>
         <translation>CONFIRM</translation>
     </message>
+    <message>
+        <source>inviteFriendsTitle</source>
+        <translation>Linphone - Invite Friends</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
diff --git a/linphone-desktop/assets/languages/fr.ts b/linphone-desktop/assets/languages/fr.ts
index bc5ae0499..70d6134cf 100644
--- a/linphone-desktop/assets/languages/fr.ts
+++ b/linphone-desktop/assets/languages/fr.ts
@@ -428,6 +428,10 @@ Url du serveur non configurée.</translation>
         <source>confirm</source>
         <translation>CONFIRMER</translation>
     </message>
+    <message>
+        <source>inviteFriendsTitle</source>
+        <translation>Linphone - Inviter des amis</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
diff --git a/linphone-desktop/src/app/App.hpp b/linphone-desktop/src/app/App.hpp
index 62e5b4d22..bf1339a89 100644
--- a/linphone-desktop/src/app/App.hpp
+++ b/linphone-desktop/src/app/App.hpp
@@ -50,10 +50,11 @@ public:
 
   QQuickWindow *getCallsWindow () const;
   QQuickWindow *getMainWindow () const;
-  QQuickWindow *getSettingsWindow () const;
 
   bool hasFocus () const;
 
+  Q_INVOKABLE QQuickWindow *getSettingsWindow () const;
+
   Q_INVOKABLE QString locale () const {
     return m_locale;
   }
diff --git a/linphone-desktop/ui/modules/Common/Dialog/DialogPlus.qml b/linphone-desktop/ui/modules/Common/Dialog/DialogPlus.qml
index 56bcc678c..a1a5cf16a 100644
--- a/linphone-desktop/ui/modules/Common/Dialog/DialogPlus.qml
+++ b/linphone-desktop/ui/modules/Common/Dialog/DialogPlus.qml
@@ -37,6 +37,15 @@ Window {
   // Handle normal windows close.
   onClosing: !_disableExitStatus && exitStatus(0)
 
+  // ---------------------------------------------------------------------------
+
+  Shortcut {
+    sequence: StandardKey.Close
+    onActivated: exit(0)
+  }
+
+  // ---------------------------------------------------------------------------
+
   ColumnLayout {
     anchors.fill: parent
     spacing: 0
diff --git a/linphone-desktop/ui/views/App/IncallFullscreen.qml b/linphone-desktop/ui/views/App/IncallFullscreen.qml
index 050a0c8a2..7cc4baa39 100644
--- a/linphone-desktop/ui/views/App/IncallFullscreen.qml
+++ b/linphone-desktop/ui/views/App/IncallFullscreen.qml
@@ -41,6 +41,13 @@ Window {
 
   // ---------------------------------------------------------------------------
 
+  Shortcut {
+    sequence: StandardKey.Close
+    onActivated: window.hide()
+  }
+
+  // ---------------------------------------------------------------------------
+
   Rectangle {
     anchors.fill: parent
     color: '#000000' // Not a style.
diff --git a/linphone-desktop/ui/views/App/InviteFriends.qml b/linphone-desktop/ui/views/App/InviteFriends.qml
index a628f331d..3507a0866 100644
--- a/linphone-desktop/ui/views/App/InviteFriends.qml
+++ b/linphone-desktop/ui/views/App/InviteFriends.qml
@@ -12,17 +12,18 @@ DialogPlus {
     TextButtonA {
       text: qsTr('cancel')
 
-      onClicked: exit(0)
+      onClicked: exit(-1)
     },
     TextButtonB {
       enabled: email.length && message.length
       text: qsTr('confirm')
 
-      onClicked: exit(-1)
+      onClicked: exit(0)
     }
   ]
 
   centeredButtons: true
+  title: qsTr('inviteFriendsTitle')
 
   height: InviteFriendsStyle.height
   width: InviteFriendsStyle.width
diff --git a/linphone-desktop/ui/views/App/Main/MainWindow.qml b/linphone-desktop/ui/views/App/Main/MainWindow.qml
index 9535fcefe..fca04e627 100644
--- a/linphone-desktop/ui/views/App/Main/MainWindow.qml
+++ b/linphone-desktop/ui/views/App/Main/MainWindow.qml
@@ -103,6 +103,13 @@ Controls1.ApplicationWindow {
 
   // ---------------------------------------------------------------------------
 
+  Shortcut {
+    sequence: StandardKey.Close
+    onActivated: window.hide()
+  }
+
+  // ---------------------------------------------------------------------------
+
   ColumnLayout {
     id: container
 
diff --git a/linphone-desktop/ui/views/App/Main/MainWindowMenuBar.qml b/linphone-desktop/ui/views/App/Main/MainWindowMenuBar.qml
index d11760ea3..5587d2ac7 100644
--- a/linphone-desktop/ui/views/App/Main/MainWindowMenuBar.qml
+++ b/linphone-desktop/ui/views/App/Main/MainWindowMenuBar.qml
@@ -2,7 +2,7 @@ import QtQuick 2.7
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 
-import Common 1.0 as Common
+import Linphone 1.0
 
 import App.Styles 1.0
 
@@ -109,6 +109,8 @@ import App.Styles 1.0
      MenuItem {
        shortcut: 'Ctrl+P'
        text: qsTr('settings')
+
+       onTriggered: App.getSettingsWindow().show()
      }
 
      MenuSeparator {}
@@ -116,6 +118,8 @@ import App.Styles 1.0
      MenuItem {
        shortcut: StandardKey.Quit
        text: qsTr('quit')
+
+       onTriggered: Qt.quit()
      }
    }
 
diff --git a/linphone-desktop/ui/views/App/Settings/SettingsWindow.qml b/linphone-desktop/ui/views/App/Settings/SettingsWindow.qml
index 3e32eafac..e3ce3b404 100644
--- a/linphone-desktop/ui/views/App/Settings/SettingsWindow.qml
+++ b/linphone-desktop/ui/views/App/Settings/SettingsWindow.qml
@@ -19,7 +19,15 @@ ApplicationWindow {
   minimumWidth: SettingsWindowStyle.width
 
   title: qsTr('settingsTitle')
-  visible: true
+
+  // ---------------------------------------------------------------------------
+
+  Shortcut {
+    sequence: StandardKey.Close
+    onActivated: window.hide()
+  }
+
+  // ---------------------------------------------------------------------------
 
   ColumnLayout {
     anchors.fill: parent