@@ -28,6 +28,7 @@ FocusScope {
2828 property int panelWidth: 0
2929 readonly property bool moving: listLoader.item && listLoader.item.moving
3030 readonly property Item searchTextField: searchField
31+ readonly property real delegateWidth: units.gu(10)
3132
3233 signal applicationSelected(string appId)
3334
@@ -272,7 +273,7 @@ FocusScope {
272273
273274 model: sortProxyModel
274275
275− delegateWidth: units.gu(10)
276+ delegateWidth: root.delegateWidth
276277 delegateHeight: units.gu(10)
277278 delegate: drawerDelegateComponent
278279 }
@@ -332,7 +333,7 @@ FocusScope {
332333 filterLetter: model.letter
333334 dynamicSortFilter: false
334335 }
335− delegateWidth: units.gu(10)
336+ delegateWidth: root.delegateWidth
336337 delegateHeight: units.gu(10)
337338 delegate: drawerDelegateComponent
338339 }
@@ -413,12 +414,16 @@ FocusScope {
413414 active: label.truncated && drawerDelegate.hovered
414415 sourceComponent: Rectangle {
415416 color: UbuntuColors.jet
416− width: fullLabel.width + units.gu(1)
417+ width: fullLabel.contentWidth + units.gu(1)
417418 height: fullLabel.height + units.gu(1)
418− border.color: UbuntuColors.blue
419419 radius: units.dp(4)
420420 Label {
421421 id: fullLabel
422+ width: Math.min(root.delegateWidth * 2, implicitWidth)
423+ wrapMode: Text.Wrap
424+ horizontalAlignment: Text.AlignHCenter
425+ maximumLineCount: 3
426+ elide: Text.ElideRight
422427 anchors.centerIn: parent
423428 text: model.name
424429 fontSize: "small"