diff --git a/linphone-app/ui/modules/Common/Form/SearchBox.qml b/linphone-app/ui/modules/Common/Form/SearchBox.qml
index d3ad8a8b6..24ff035e6 100644
--- a/linphone-app/ui/modules/Common/Form/SearchBox.qml
+++ b/linphone-app/ui/modules/Common/Form/SearchBox.qml
@@ -18,6 +18,7 @@ Item {
   property alias entryHeight: menu.entryHeight
   property alias maxMenuHeight: menu.maxMenuHeight
   property alias placeholderText: searchField.placeholderText
+  property alias tooltipText : tooltip.text
 
   default property alias _content: menu._content
 
@@ -125,6 +126,10 @@ Item {
       onClicked: mouse.accepted=false
       onDoubleClicked: mouse.accepted=false
       onPressAndHold: mouse.accepted=false
+      TooltipArea {
+              id:tooltip
+              visible: !isOpen && text !== ''
+      }
   }
 
   // ---------------------------------------------------------------------------
diff --git a/linphone-app/ui/modules/Common/Popup/DesktopPopup.qml b/linphone-app/ui/modules/Common/Popup/DesktopPopup.qml
index fa3793941..d862b0162 100644
--- a/linphone-app/ui/modules/Common/Popup/DesktopPopup.qml
+++ b/linphone-app/ui/modules/Common/Popup/DesktopPopup.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.7
-import QtQuick.Window 2.12
+import QtQuick.Window 2.2
 
 import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.3
diff --git a/linphone-app/ui/modules/Common/Tooltip/Tooltip.qml b/linphone-app/ui/modules/Common/Tooltip/Tooltip.qml
index 1ebcd43ed..ca8016cd4 100644
--- a/linphone-app/ui/modules/Common/Tooltip/Tooltip.qml
+++ b/linphone-app/ui/modules/Common/Tooltip/Tooltip.qml
@@ -117,11 +117,13 @@ Core.ToolTip {
 
   contentItem: Core.Text {
     id: text
-
     color: TooltipStyle.color
     font.pointSize: TooltipStyle.pointSize
     padding: TooltipStyle.padding + TooltipStyle.margins
     text: tooltip.text
+    wrapMode: Core.Text.WordWrap
+    width:parent.width
+    elide:Core.Text.ElideRight
   }
 
   delay: TooltipStyle.delay
diff --git a/linphone-app/ui/modules/Common/Tooltip/TooltipArea.qml b/linphone-app/ui/modules/Common/Tooltip/TooltipArea.qml
index 1f25fae12..bfb75e64d 100644
--- a/linphone-app/ui/modules/Common/Tooltip/TooltipArea.qml
+++ b/linphone-app/ui/modules/Common/Tooltip/TooltipArea.qml
@@ -1,5 +1,6 @@
 import QtQuick 2.7
 
+import Common 1.0
 import Common.Styles 1.0
 
 // =============================================================================
@@ -14,7 +15,8 @@ MouseArea {
 
   property bool _visible: false
 
-  anchors.fill: parent
+  anchors.fill:parent
+
   hoverEnabled: true
   scrollGestureEnabled: true
 
@@ -31,6 +33,7 @@ MouseArea {
     delay: tooltipArea.delay
     parent: tooltipParent
     visible: _visible || force
+    width: tooltipParent.width
 
     timeout: -1
 
diff --git a/linphone-app/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml b/linphone-app/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml
index 512e898b8..f00c6fdbd 100644
--- a/linphone-app/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml
+++ b/linphone-app/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml
@@ -1,3 +1,5 @@
+import QtQuick 2.7
+
 import Common 1.0
 import Linphone 1.0
 
@@ -11,6 +13,7 @@ SearchBox {
   // ---------------------------------------------------------------------------
 
   readonly property alias isOpen: searchBox._isOpen
+  property alias header : view.headerItem
 
   // ---------------------------------------------------------------------------
 
diff --git a/linphone-app/ui/views/App/Main/MainWindow.qml b/linphone-app/ui/views/App/Main/MainWindow.qml
index 936e9f001..3525ef389 100644
--- a/linphone-app/ui/views/App/Main/MainWindow.qml
+++ b/linphone-app/ui/views/App/Main/MainWindow.qml
@@ -148,6 +148,7 @@ ApplicationWindow {
 
             maxMenuHeight: MainWindowStyle.searchBox.maxHeight
             placeholderText: qsTr('mainSearchBarPlaceholder')
+            tooltipText: qsTr('smartSearchBarTooltip')
 
             onAddContact: window.setView('ContactEdit', {
               sipAddress: sipAddress
@@ -175,11 +176,6 @@ ApplicationWindow {
             })
 
             onLaunchVideoCall: CallsListModel.launchVideoCall(sipAddress)
-
-            TooltipArea {
-              text: qsTr('smartSearchBarTooltip')
-              visible: !smartSearchBar.isOpen
-            }
           }
 
           ActionButton {
@@ -189,9 +185,9 @@ ApplicationWindow {
 
             onClicked: Logic.openConferenceManager()
 
-	    TooltipArea {
-	      text: qsTr('newConferenceButton')
-	    }
+            TooltipArea {
+              text: qsTr('newConferenceButton')
+            }
           }
 
           ActionButton {