diff --git a/hc/front/templatetags/hc_extras.py b/hc/front/templatetags/hc_extras.py
index 3c2c0fbc..41634b58 100644
--- a/hc/front/templatetags/hc_extras.py
+++ b/hc/front/templatetags/hc_extras.py
@@ -81,3 +81,10 @@ def num_down_title(num_down):
         return "%d down – %s" % (num_down, settings.SITE_NAME)
     else:
         return settings.SITE_NAME
+
+@register.filter
+def break_underscore(s):
+    if len(s) > 30:
+        s = s.replace("_", "_\u200b")
+
+    return s
diff --git a/templates/front/my_checks_desktop.html b/templates/front/my_checks_desktop.html
index 9e0c7184..f2768646 100644
--- a/templates/front/my_checks_desktop.html
+++ b/templates/front/my_checks_desktop.html
@@ -59,7 +59,7 @@
                     data-tags="{{ check.tags }}"
                     data-url="{% url 'hc-update-name' check.code %}"
                     class="my-checks-name {% if not check.name %}unnamed{% endif %}">
-                <div>{{ check.name|default:"unnamed" }}</div>
+                <div>{{ check.name|default:"unnamed"|break_underscore }}</div>
                 {% for tag in check.tags_list %}
                 <span class="label label-tag">{{ tag }}</span>
                 {% endfor %}