diff --git a/public/js/controllers/rootCtrl.js b/public/js/controllers/rootCtrl.js
index 0efb9031c8..c433d2729b 100644
--- a/public/js/controllers/rootCtrl.js
+++ b/public/js/controllers/rootCtrl.js
@@ -77,7 +77,7 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$
         default:
           $rootScope.charts[id] = !$rootScope.charts[id];
           history = task.history;
-          if (task) task._editing = false;
+          if (task && task._editing) task._editing = false;
       }
       matrix = [['Date', 'Score']];
       _.each(history, function(obj) {
diff --git a/public/js/controllers/tasksCtrl.js b/public/js/controllers/tasksCtrl.js
index 0bb798ccdc..752d3cdd7c 100644
--- a/public/js/controllers/tasksCtrl.js
+++ b/public/js/controllers/tasksCtrl.js
@@ -70,6 +70,13 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User', '
         op: "revive"
       });
     };
+
+    $scope.toggleEdit = function(task){
+      console.log(task)
+      task._editing = !task._editing;
+      if($rootScope.charts[task.id]) $rootScope.charts[task.id] = false;
+    };
+
     $scope.remove = function(task) {
       var tasks;
       if (confirm("Are you sure you want to delete this task?") !== true) {
@@ -82,6 +89,7 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User', '
       });
       tasks.splice(tasks.indexOf(task), 1);
     };
+
     /*
      ------------------------
      Items
diff --git a/views/tasks/task.jade b/views/tasks/task.jade
index 68f31e4244..c1ce681284 100644
--- a/views/tasks/task.jade
+++ b/views/tasks/task.jade
@@ -9,10 +9,10 @@ li(ng-repeat='task in user[list.type + "s"]', class='task {{taskClasses(task,use
     i.icon-tags(tooltip='{{appliedTags(user.tags, task.tags)}}', ng-hide='noTags(task.tags)')
 
     // edit
-    a(ng-hide='task._editing', ng-click='task._editing = !task._editing', tooltip='Edit')
+    a(ng-hide='task._editing', ng-click='toggleEdit(task)', tooltip='Edit')
       i.icon-pencil(ng-hide='task._editing')
     // cancel
-    a(ng-hide='!task._editing', ng-click='task._editing = !task._editing', tooltip='Cancel')
+    a(ng-hide='!task._editing', ng-click='toggleEdit(task)', tooltip='Cancel')
       i.icon-remove(ng-hide='!task._editing')
     //- challenges
     //  {{#if task.challenge}}