diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7fd962f9..9b1cc078 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 12.0.2
+
+* Fix task list label styling.
+
 ## 12.0.1
 
 ### Minor changes and fixes
diff --git a/conversejs/custom/plugins/tasks/styles/muc-task-lists.scss b/conversejs/custom/plugins/tasks/styles/muc-task-lists.scss
index 371cbd11..f0ee6a7b 100644
--- a/conversejs/custom/plugins/tasks/styles/muc-task-lists.scss
+++ b/conversejs/custom/plugins/tasks/styles/muc-task-lists.scss
@@ -34,6 +34,11 @@
       .task-list-name {
         flex-grow: 2;
 
+        label {
+          // Cancelling the Peertube margin-bottom on labels
+          margin: 0;
+        }
+
         form {
           display: flex;
           flex-flow: row nowrap;
diff --git a/conversejs/custom/plugins/tasks/templates/muc-task-list.js b/conversejs/custom/plugins/tasks/templates/muc-task-list.js
index 88c1a950..f05d96b7 100644
--- a/conversejs/custom/plugins/tasks/templates/muc-task-list.js
+++ b/conversejs/custom/plugins/tasks/templates/muc-task-list.js
@@ -39,7 +39,7 @@ export default function tplMucTaskList (el, tasklist) {
       ${!el.edit
         ? html`
           <div class="task-list-name">
-            <a @click=${el.toggleTasks}>${tasklist.get('name')}</a>
+            <a @click=${el.toggleTasks}><label>${tasklist.get('name')}</label></a>
           </div>
           <button type="button" class="task-list-action" title="${i18nCreateTask}" @click=${el.openAddTaskForm}>
             <converse-icon class="fa fa-plus" size="1em"></converse-icon>