diff --git a/data/core.yaml b/data/core.yaml
index bc75054af..fa0151428 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -1164,8 +1164,8 @@ en:
           indirect_noedit: "You may not edit indirect restrictions. Instead, edit the nearby direct restriction."
   issues:
     title: Issues
-    description: Issues
     key: I
+    list_title: "Issues ({count})"
     errors:
       list_title: "Errors ({count})"
       icon_tooltip: error
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 9c4edf2a0..71e5c09ab 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1411,8 +1411,8 @@
         },
         "issues": {
             "title": "Issues",
-            "description": "Issues",
             "key": "I",
+            "list_title": "Issues ({count})",
             "errors": {
                 "list_title": "Errors ({count})",
                 "icon_tooltip": "error"
diff --git a/modules/ui/entity_issues.js b/modules/ui/entity_issues.js
index 6ac0e57c2..5ddb40406 100644
--- a/modules/ui/entity_issues.js
+++ b/modules/ui/entity_issues.js
@@ -25,7 +25,6 @@ export function uiEntityIssues(context) {
 
     function entityIssues(selection) {
         selection.call(uiDisclosure(context, 'entity_issues', true)
-            .title(t('issues.title'))
             .content(render)
         );
     }
@@ -44,6 +43,9 @@ export function uiEntityIssues(context) {
             return;
         }
 
+        d3_select('.hide-toggle-entity_issues span')
+            .text(t('issues.list_title', { count: issues.length }));
+
         var items = selection.selectAll('.issue')
             .data(issues, function(d) {
                 if (d.id) {
diff --git a/modules/ui/issues.js b/modules/ui/issues.js
index 0343f4dbb..4c067bb90 100644
--- a/modules/ui/issues.js
+++ b/modules/ui/issues.js
@@ -299,7 +299,7 @@ export function uiIssues(context) {
         var paneTooltip = tooltip()
             .placement((textDirection === 'rtl') ? 'right' : 'left')
             .html(true)
-            .title(uiTooltipHtml(t('issues.description'), key));
+            .title(uiTooltipHtml(t('issues.title'), key));
 
         var button = selection
             .append('button')