diff --git a/app/gui/AppView.qml b/app/gui/AppView.qml
index cbd19f1b..11042fe7 100644
--- a/app/gui/AppView.qml
+++ b/app/gui/AppView.qml
@@ -100,6 +100,12 @@ GridView {
             horizontalAlignment: Text.AlignHCenter
             wrapMode: Text.Wrap
             elide: Text.ElideRight
+
+            // Display a tooltip with the full name if it's truncated
+            ToolTip.text: model.name
+            ToolTip.delay: 1000
+            ToolTip.timeout: 5000
+            ToolTip.visible: parent.hovered && truncated
         }
 
         function launchOrResumeSelectedApp()
@@ -133,16 +139,6 @@ GridView {
             }
         }
 
-        ToolTip {
-            // We don't use the shared tooltip because then the tooltip
-            // would follow the mouse cursor while visible rather than
-            // resetting to invisible as it should
-            text: model.name
-            delay: 1000
-            timeout: 5000
-            visible: parent.hovered
-        }
-
         Keys.onMenuPressed: {
             // We must use open() here so the menu is positioned on
             // the ItemDelegate and not where the mouse cursor is