diff --git a/Modules/Tooltip/Tooltip.qml b/Modules/Tooltip/Tooltip.qml
index b982ff1fc..85999b860 100644
--- a/Modules/Tooltip/Tooltip.qml
+++ b/Modules/Tooltip/Tooltip.qml
@@ -414,7 +414,8 @@ PopupWindow {
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter
         wrapMode: Text.WordWrap
-        width: root.maxWidth - (root.padding * 2)
+        width: Math.min(implicitWidth, root.maxWidth - (root.padding * 2))
+        richTextEnabled: true
       }
     }
   }
diff --git a/Widgets/NText.qml b/Widgets/NText.qml
index 3dd3933fa..687900156 100644
--- a/Widgets/NText.qml
+++ b/Widgets/NText.qml
@@ -17,6 +17,8 @@ Text {
     return fontScale;
   }
 
+  property bool richTextEnabled: false
+
   font.family: root.family
   font.weight: Style.fontWeightMedium
   font.pointSize: root.pointSize * fontScale
@@ -24,4 +26,6 @@ Text {
   elide: Text.ElideRight
   wrapMode: Text.NoWrap
   verticalAlignment: Text.AlignVCenter
+
+  textFormat: richTextEnabled ? Text.RichText : Text.PlainText
 }