diff --git a/client/src/components/Container.vue b/client/src/components/Container.vue
index ca63fe3c..483c8fb0 100644
--- a/client/src/components/Container.vue
+++ b/client/src/components/Container.vue
@@ -30,6 +30,9 @@ export default {
 .container.row.center {
   align-items: center;
 }
+.container.row.baseline {
+  align-items: baseline;
+}
 .container.row > * {
   flex-shrink: 0;
 }
diff --git a/client/src/components/tasks/TaskItem.vue b/client/src/components/tasks/TaskItem.vue
index 06d62103..d130442e 100644
--- a/client/src/components/tasks/TaskItem.vue
+++ b/client/src/components/tasks/TaskItem.vue
@@ -6,7 +6,7 @@
     :onCancel="stopEditMode"
   ></edit-task>
   <list-item v-else :class="['task-item', { finished: task.isFinished }]">
-    <container row align="center">
+    <container row align="baseline">
       <span class="my-handle">::</span>
 
       <a v-if="!notoggle" href="#" @click.prevent="toggleFinishTask" class="toggle">
@@ -110,6 +110,10 @@
       padding: 5px;
     }
 
+    .label {
+      white-space: normal;
+    }
+
     &:nth-child(even) {
       background-color: #f4f4f4;
     }