diff --git a/client/src/components/Panels/Common/ToolPanelLabel.vue b/client/src/components/Panels/Common/ToolPanelLabel.vue
index 36dc2f47b57..ddc12309d94 100644
--- a/client/src/components/Panels/Common/ToolPanelLabel.vue
+++ b/client/src/components/Panels/Common/ToolPanelLabel.vue
@@ -1,12 +1,7 @@
 <template>
-    <div
-        v-b-tooltip.topright.hover
-        class="tool-panel-label"
-        :title="description"
-        @mouseover="hover = true"
-        @mouseleave="hover = false">
+    <div v-b-tooltip.topright.hover class="tool-panel-label" :title="description">
         {{ definition.text }}
-        <ToolPanelLinks :show="hover" :links="definition.links" />
+        <ToolPanelLinks :links="definition.links" />
     </div>
 </template>
 
@@ -21,11 +16,6 @@ export default {
             required: true,
         },
     },
-    data() {
-        return {
-            hover: false,
-        };
-    },
     computed: {
         description() {
             return this.definition.description;
@@ -33,3 +23,15 @@ export default {
     },
 };
 </script>
+
+<style scoped lang="scss">
+.tool-panel-label {
+    &:deep(.tool-panel-links) {
+        display: none;
+    }
+
+    &:hover:deep(.tool-panel-links) {
+        display: inline;
+    }
+}
+</style>
diff --git a/client/src/components/Panels/Common/ToolPanelLinks.vue b/client/src/components/Panels/Common/ToolPanelLinks.vue
index 132d4818c34..8aba2b49644 100644
--- a/client/src/components/Panels/Common/ToolPanelLinks.vue
+++ b/client/src/components/Panels/Common/ToolPanelLinks.vue
@@ -1,7 +1,8 @@
 <template>
-    <span v-if="link">
+    <span v-if="link" class="tool-panel-links">
         <a :href="link" target="_blank" style="display: inline">
-            <font-awesome-icon v-show="show" v-b-tooltip.hover title="Link" icon="external-link-alt" />
+            <font-awesome-icon v-b-tooltip.hover title="Link" icon="external-link-alt" />
+            <span class="sr-only">Link</span>
         </a>
     </span>
 </template>
@@ -18,9 +19,7 @@ export default {
     props: {
         links: {
             type: Object,
-        },
-        show: {
-            type: Boolean,
+            default: () => ({}),
         },
     },
     computed: {
diff --git a/client/src/components/Panels/Common/ToolSection.vue b/client/src/components/Panels/Common/ToolSection.vue
index 39942c94cff..d57b7eb2cb6 100644
--- a/client/src/components/Panels/Common/ToolSection.vue
+++ b/client/src/components/Panels/Common/ToolSection.vue
@@ -18,7 +18,10 @@
         <transition name="slide">
             <div v-if="opened">
                 <template v-for="[key, el] in sortedElements">
-                    <ToolPanelLabel v-if="category.text" :key="key" :definition="el" />
+                    <ToolPanelLabel
+                        v-if="category.text || el.model_class === 'ToolSectionLabel'"
+                        :key="key"
+                        :definition="el" />
                     <tool
                         v-else
                         :key="key"
@@ -253,4 +256,14 @@ export default {
     overflow: hidden;
     max-height: 0;
 }
+
+.title-link {
+    &:deep(.tool-panel-links) {
+        display: none;
+    }
+
+    &:hover:deep(.tool-panel-links) {
+        display: inline;
+    }
+}
 </style>