diff --git a/libraries/classes/Twig/UtilExtension.php b/libraries/classes/Twig/UtilExtension.php
index e9cdcf8189..679ab21e6f 100644
--- a/libraries/classes/Twig/UtilExtension.php
+++ b/libraries/classes/Twig/UtilExtension.php
@@ -59,11 +59,6 @@ class UtilExtension extends AbstractExtension
                 'PhpMyAdmin\Util::getButtonOrImage',
                 ['is_safe' => ['html']]
             ),
-            new TwigFunction(
-                'get_class_for_type',
-                'PhpMyAdmin\Util::getClassForType',
-                ['is_safe' => ['html']]
-            ),
             new TwigFunction(
                 'get_docu_link',
                 'PhpMyAdmin\Util::getDocuLink',
diff --git a/templates/table/structure/display_structure.twig b/templates/table/structure/display_structure.twig
index 105e935a35..55505e549b 100644
--- a/templates/table/structure/display_structure.twig
+++ b/templates/table/structure/display_structure.twig
@@ -62,7 +62,7 @@
                     {{ displayed_fields[rownum].icon|raw }}
                 </label>
             </th>
-            <td {{ get_class_for_type(extracted_columnspec['type']) }}>
+            <td{{ 'set' != extracted_columnspec['type'] and 'enum' != extracted_columnspec['type'] ? ' class="nowrap"' }}>
                 <bdo dir="ltr" lang="en">
                     {{ extracted_columnspec['displayed_type']|raw }}
                     {% if relation_commwork and relation_mimework and browse_mime