diff --git a/website/public/css/tasks.styl b/website/public/css/tasks.styl
index 6c5d39184d..5708aee8de 100644
--- a/website/public/css/tasks.styl
+++ b/website/public/css/tasks.styl
@@ -44,6 +44,8 @@ for $stage in $stages
         background-color: darken($stage[1], 30%)
         &:hover, &:focus
           background-color: darken($stage[1], 40%)
+      input[type=checkbox]:focus + label
+        background-color: darken($stage[1], 40%)
       .task-actions a:nth-of-type(2)
         border-top: 1px solid darken($stage[1],50%) // If there are two habit buttons (+ -), add a border to separate them
       .task-options
@@ -91,6 +93,8 @@ for $stage in $stages
     background-color: darken($completed, 30%)
     &:hover, &:focus
       background-color: darken($completed, 40%)
+  input[type=checkbox]:focus + label
+    background-color: darken($completed, 40%)
   .task-options
     background-color: $completed
   .option-group:not(.task-checklist)
@@ -281,6 +285,7 @@ for $stage in $stages
   margin: 0
   padding: 0
   height: 0px
+  opacity: 0
   width: 0px
 
 .task-checker label
diff --git a/website/views/shared/tasks/task_view/index.jade b/website/views/shared/tasks/task_view/index.jade
index f15490969d..0808903b96 100644
--- a/website/views/shared/tasks/task_view/index.jade
+++ b/website/views/shared/tasks/task_view/index.jade
@@ -19,7 +19,8 @@
   span.task-checker.action-yesno(ng-if='::task.type=="daily" || task.type=="todo"')
     input.visuallyhidden.focusable(id='box-{{::obj._id}}_{{::task.id}}', type='checkbox', 
       ng-model='task.completed', ng-if='$state.includes("tasks")', 
-      ng-change='task.type=="todo" && pushTask(task,$index,"bottom"); changeCheck(task)')
+      ng-change='task.type=="todo" && pushTask(task,$index,"bottom"); changeCheck(task)'
+      ui-keypress='{13:"task.completed = !task.completed; changeCheck(task)"}' )
     input.visuallyhidden.focusable(id='box-{{::obj._id}}_{{::task.id}}', type='checkbox', 
       ng-if='!$state.includes("tasks")')
     label(for='box-{{::obj._id}}_{{::task.id}}')