diff --git a/assets/css/app.css b/assets/css/app.css
index 7b664f9d..a49b28c5 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -242,6 +242,11 @@ showing the sidebar (on devices with md or higher)
 * Bootstrap extensions
 *****************************************/
 
+.w-fit {
+    width: -moz-fit-content;
+    width: fit-content;
+}
+
 .bg-primary-striped {
     background: repeating-linear-gradient(
             -45deg,
diff --git a/assets/ts_src/event_listeners.ts b/assets/ts_src/event_listeners.ts
index 36a739f7..25abcbc8 100644
--- a/assets/ts_src/event_listeners.ts
+++ b/assets/ts_src/event_listeners.ts
@@ -121,7 +121,7 @@ $(document).on("ajaxUI:reload ajaxUI:start", function () {
 //Use bootstrap tooltips for the most tooltips
 $(document).on("ajaxUI:start ajaxUI:reload ajaxUI:dt_loaded", function () {
     $(".tooltip").remove();
-    $('a[title], button[title], span[title], h6[title], i.fas[title]')
+    $('a[title], button[title], span[title], h6[title], h3[title], i.fas[title]')
     //@ts-ignore
         .tooltip("hide").tooltip({container: "body", placement: "auto", boundary: 'window'});
 });
diff --git a/templates/Parts/info/_main_infos.html.twig b/templates/Parts/info/_main_infos.html.twig
index ebe321a4..a3f2266a 100644
--- a/templates/Parts/info/_main_infos.html.twig
+++ b/templates/Parts/info/_main_infos.html.twig
@@ -21,7 +21,7 @@
                 <small>{{ part.manufacturerProductNumber }}</small>
             {% endif %}
         </h5>
-        <h3>{{ part.name }}
+        <h3 class="w-fit" title="{% trans %}name.label{% endtrans %}">{{ part.name }}
             {# You need edit permission to use the edit button #}
             {% if timeTravel is not null %}
                 <a href="{{ part|entityURL('info') }}"><i title="{% trans %}part.back_to_info{% endtrans %}" class="fas fa-fw fa-arrow-circle-left"></i></a>
@@ -29,7 +29,7 @@
                 <a href="{{ part|entityURL('edit') }}"><i class="fas fa-fw fa-sm fa-edit"></i></a>
             {% endif %}
         </h3>
-        <h6 class="text-muted"><span title="{% trans %}description.label{% endtrans %}">{{ part.description|markdown(true) }}</span></h6>
+        <h6 class="text-muted w-fit" title="{% trans %}description.label{% endtrans %}"><span>{{ part.description|markdown(true) }}</span></h6>
         <h6 class="">
             <i class="fas fa-tag fa-fw" title="{% trans %}category.label{% endtrans %}"></i>
             <span class="text-muted">{{ helper.structural_entity_link(part.category) }}</span>