diff --git a/src/components/input/fancycheckbox.vue b/src/components/input/fancycheckbox.vue
index e29ebe9e..c1edc3b8 100644
--- a/src/components/input/fancycheckbox.vue
+++ b/src/components/input/fancycheckbox.vue
@@ -1,6 +1,12 @@
 <template>
 	<div class="fancycheckbox" :class="{'is-disabled': disabled}">
-		<input @change="updateData" type="checkbox" :id="checkBoxId" :checked="checked" style="display: none;" :disabled="disabled">
+		<input
+				@change="updateData"
+				type="checkbox"
+				:id="checkBoxId"
+				:checked="checked"
+				style="display: none;"
+				:disabled="disabled"/>
 		<label :for="checkBoxId" class="check">
 			<svg width="18px" height="18px" viewBox="0 0 18 18">
 				<path d="M1,9 L1,3.5 C1,2 2,1 3.5,1 L14.5,1 C16,1 17,2 17,3.5 L17,14.5 C17,16 16,17 14.5,17 L3.5,17 C2,17 1,16 1,14.5 L1,9 Z"></path>
diff --git a/src/styles/components/tasks.scss b/src/styles/components/tasks.scss
index 28337532..eeac377d 100644
--- a/src/styles/components/tasks.scss
+++ b/src/styles/components/tasks.scss
@@ -8,17 +8,17 @@
       max-width: 53vw;
     }
   }
-  
+
   @media screen and (max-width: $tablet) {
     max-width: 100%;
   }
 
-  &.noborder{
+  &.noborder {
     margin: 1rem -0.5rem;
   }
 
   .task {
-    display: block;
+    display: flex;
     padding: 0.5rem 1rem;
     border-bottom: 1px solid darken(#fff, 10%);
     transition: background-color $transition;
@@ -28,7 +28,7 @@
     }
 
     span:not(.tag) {
-      width: calc(100% - 40px);
+      width: 100%;
       display: inline-block;
       cursor: pointer;
 
@@ -39,13 +39,14 @@
         text-overflow: ellipsis;
         overflow: hidden;
         display: inline-block;
-        width: 94%;
+        max-width: calc(#{$desktop} - 27px - 2rem); // The max width of the outer container minus the padding
+        width: calc(100% - 2rem); // The max width of the outer container minus the padding
 
-        @media screen and (max-width: $tablet) {
-          width: 89%;
+        @media screen and (max-width: $desktop) {
+          max-width: calc(100vw - 27px - 2rem - 1.5rem - 3rem); // 1.5rem is the padding of the tasks container, 3rem is the padding of .app-container
         }
 
-        .overdue{
+        .overdue {
           color: $red;
         }
 
@@ -57,6 +58,10 @@
         }
       }
 
+      .fancycheckbox span {
+        display: none;
+      }
+
       .tag {
         margin: 0 0.5em;
       }
@@ -79,7 +84,7 @@
       }
     }
 
-    .tasktext.done{
+    .tasktext.done {
       text-decoration: line-through;
       color: $grey;
     }
@@ -97,7 +102,7 @@
       vertical-align: middle;
     }
 
-    .settings{
+    .settings {
       float: right;
       width: 24px;
       cursor: pointer;
@@ -109,13 +114,27 @@
   }
 }
 
-.taskedit{
+.is-menu-enabled .tasks .task span:not(.tag) {
+  .tasktext, &.tasktext {
+    @media screen and (max-width: $desktop) {
+      max-width: calc(100vw - 27px - 2rem - 1.5rem - 3rem - #{$navbar-width}); // 1.5rem is the padding of the tasks container, 3rem is the padding of .app-container
+    }
+
+    // Duplicated rule to have it work properly in at least some browsers
+    // This should be fine as the ui doesn't work in rare edge cases to begin with
+    @media screen and (max-width: calc(#{$desktop} + #{$navbar-width})) {
+      max-width: calc(100vw - 27px - 2rem - 1.5rem - 3rem - #{$navbar-width}); // 1.5rem is the padding of the tasks container, 3rem is the padding of .app-container
+    }
+  }
+}
+
+.taskedit {
   min-height: calc(100% - 1rem);
   margin-top: 1rem;
 
 
-  .priority-select{
-    .select, select{
+  .priority-select {
+    .select, select {
       width: 100%;
     }
   }
@@ -124,26 +143,26 @@
     list-style: none;
     margin: 0;
 
-    li{
+    li {
       padding: 0.5em 0.5em 0;
 
-      a{
+      a {
         float: right;
         color: $red;
         transition: all $transition;
 
-        &:hover{
+        &:hover {
           color: darken($red, 15);
         }
       }
     }
   }
 
-  .tag{
+  .tag {
     margin-right: 0.5em;
     margin-bottom: 0.5em;
 
-    &:last-child{
+    &:last-child {
       margin-right: 0;
     }
   }
diff --git a/src/styles/theme/navigation.scss b/src/styles/theme/navigation.scss
index b8cf2c5d..e5895ee3 100644
--- a/src/styles/theme/navigation.scss
+++ b/src/styles/theme/navigation.scss
@@ -116,7 +116,7 @@
     bottom: 0;
     top: $navbar-height;
     overflow-x: auto;
-    width: 17vw;
+    width: $navbar-width;
 
     padding: 0 0 1em;
     left: -147vw;
diff --git a/src/styles/theme/variables.scss b/src/styles/theme/variables.scss
index b1cf757a..8ced53d3 100644
--- a/src/styles/theme/variables.scss
+++ b/src/styles/theme/variables.scss
@@ -50,3 +50,4 @@ $user-dropdown-width-mobile: 4rem;
 $hamburger-menu-icon-spacing: 1rem;
 $hamburger-menu-icon-width: 28px;
 $navbar-height: 4rem;
+$navbar-width: 17vw;