diff --git a/linphone-desktop/ui/modules/Common/Form/Fields/TextAreaField.qml b/linphone-desktop/ui/modules/Common/Form/Fields/TextAreaField.qml
index aeb58918f..1a5bcabf5 100644
--- a/linphone-desktop/ui/modules/Common/Form/Fields/TextAreaField.qml
+++ b/linphone-desktop/ui/modules/Common/Form/Fields/TextAreaField.qml
@@ -10,9 +10,14 @@ Flickable {
   property alias text: textArea.text
   readonly property alias length: textArea.length
 
+  boundsBehavior: Flickable.StopAtBounds
   height: TextAreaFieldStyle.background.height
   width: TextAreaFieldStyle.background.width
 
+  ScrollBar.vertical: ForceScrollBar {
+    id: scrollBar
+  }
+
   TextArea.flickable: TextArea {
     id: textArea
 
@@ -39,8 +44,4 @@ Flickable {
     rightPadding: TextAreaFieldStyle.text.padding + Number(scrollBar.visible) * scrollBar.width
     topPadding: TextAreaFieldStyle.text.padding
   }
-
-  ScrollBar.vertical: ForceScrollBar {
-    id: scrollBar
-  }
 }
diff --git a/linphone-desktop/ui/views/App/Main/MainWindow.js b/linphone-desktop/ui/views/App/Main/MainWindow.js
index de36d0404..5325abca2 100644
--- a/linphone-desktop/ui/views/App/Main/MainWindow.js
+++ b/linphone-desktop/ui/views/App/Main/MainWindow.js
@@ -16,6 +16,13 @@ function handleActiveFocusItemChanged (activeFocusItem) {
   }
 }
 
+function handleClosing (close) {
+  if (Qt.platform.os === 'osx') {
+    close.accepted = false
+    window.showMinimized()
+  }
+}
+
 // -----------------------------------------------------------------------------
 
 function lockView (info) {
diff --git a/linphone-desktop/ui/views/App/Main/MainWindow.qml b/linphone-desktop/ui/views/App/Main/MainWindow.qml
index ff585725c..46ecb879b 100644
--- a/linphone-desktop/ui/views/App/Main/MainWindow.qml
+++ b/linphone-desktop/ui/views/App/Main/MainWindow.qml
@@ -54,6 +54,7 @@ ApplicationWindow {
   // ---------------------------------------------------------------------------
 
   onActiveFocusItemChanged: Logic.handleActiveFocusItemChanged(activeFocusItem)
+  onClosing: Logic.handleClosing(close)
 
   // ---------------------------------------------------------------------------