diff --git a/public/css/tasks.styl b/public/css/tasks.styl
index 4cc0af1fe3..c9e96e4359 100644
--- a/public/css/tasks.styl
+++ b/public/css/tasks.styl
@@ -429,5 +429,12 @@ form
   .checklist-icons
     opacity:0
 
-  label:hover .checklist-icons
+  li
+    min-height: 20px
+    padding-left: 10px
+    margin-bottom: 5px
+
+    [type="checkbox"]
+      margin: 0px 10px 3px 0px
+  li:hover .checklist-icons
     opacity:1
diff --git a/views/shared/tasks/task.jade b/views/shared/tasks/task.jade
index eaa6ed70bc..247378f9e5 100644
--- a/views/shared/tasks/task.jade
+++ b/views/shared/tasks/task.jade
@@ -106,11 +106,12 @@ li(bindonce='list', bo-id='"task-"+task.id', ng-repeat='task in obj[list.type+"s
       form.checklist-form(ng-if='task.checklist')
         fieldset.option-group.task-checklist(ng-if='!$state.includes("options.social.challenges")')
           legend.option-title Checklist
-          label.checkbox(ng-repeat='item in task.checklist')
-            a.pull-right.checklist-icons(ng-click='removeChecklistItem(task,$index)')
-              i.icon-trash(tooltip='Delete')
-            input(type='checkbox',ng-model='item.completed',ng-change='checkChecklistItem(task)')
-            input.inline-edit(type='text',ng-model='item.text',ui-keypress="{13:'saveChecklist(task,$event,$index)'}",ng-blur='saveChecklist(task,$event,$index)')
+          ul.unstyled
+            li(ng-repeat='item in task.checklist')
+              a.pull-right.checklist-icons(ng-click='removeChecklistItem(task,$index)')
+                i.icon-trash(tooltip='Delete')
+              input(type='checkbox',ng-model='item.completed',ng-change='checkChecklistItem(task)')
+              input.inline-edit(type='text',ng-model='item.text',ui-keypress="{13:'saveChecklist(task,$event,$index)'}",ng-blur='saveChecklist(task,$event,$index)')
 
 
       form(ng-submit='saveTask(task)')