diff --git a/resources/views/tasks/time_tracker.blade.php b/resources/views/tasks/time_tracker.blade.php
index 404a1d40f82b..005a37d0eb16 100644
--- a/resources/views/tasks/time_tracker.blade.php
+++ b/resources/views/tasks/time_tracker.blade.php
@@ -358,6 +358,18 @@
 
 			ko.applyBindings(model);
 			model.tock();
+
+			if (isStorageSupported()) {
+				var taskId = localStorage.getItem('last:time_tracker_task');
+				var task = model.taskById(taskId);
+				if (task) {
+					console.log(task);
+					setTimeout(function() {
+						model.selectTask(task);
+					}, 1);
+				}
+			}
+
 			$('#taskList').show();
 
 			$('.archive-dropdown:not(.dropdown-toggle)').click(function() {
diff --git a/resources/views/tasks/time_tracker_knockout.blade.php b/resources/views/tasks/time_tracker_knockout.blade.php
index 2084e7af4bf3..f411c0245787 100644
--- a/resources/views/tasks/time_tracker_knockout.blade.php
+++ b/resources/views/tasks/time_tracker_knockout.blade.php
@@ -249,6 +249,17 @@
             }
         });
 
+        self.taskById = function(taskId) {
+            var tasks = self.tasks();
+            for (var i=0; i<tasks.length; i++) {
+                var task = tasks[i];
+                if (task.public_id() == taskId) {
+                    return task;
+                }
+            }
+            return false;
+        }
+
         self.filteredTasks = ko.computed(function() {
 
             // filter the data
@@ -300,10 +311,6 @@
             // client change event to re-filter the list
             refreshProjectList(true);
 
-            //var clone = new TaskModel(task.data);
-            //clone.original = task;
-            //self.selectedTask(clone);
-
             self.selectedTask(task);
             //self.filter('');
 
@@ -314,6 +321,10 @@
                 }
             }
 
+            if (isStorageSupported()) {
+                localStorage.setItem('last:time_tracker_task', task ? task.public_id() : 0);
+            }
+
             self.formChanged(false);
         }
     }