diff --git a/src/scripts/tutti/10_tasks.js b/src/scripts/tutti/10_tasks.js
index e952ec4..b9682fb 100644
--- a/src/scripts/tutti/10_tasks.js
+++ b/src/scripts/tutti/10_tasks.js
@@ -79,6 +79,11 @@ function item_open(item_id, item_type, pushState)
 function task_open(task_id)
 {
     item_open(task_id, 'task');
+
+    if (ProjectUtils.context() == 'shot'){
+        $('[id^="shot-"]').removeClass('active');
+        $(this).parent().parent().addClass('active');
+    }
 }
 
 function shot_open(shot_id)
@@ -356,10 +361,5 @@ $(function() {
         e.preventDefault();
         var task_id = e.delegateTarget.dataset.taskId;
         task_open(task_id);
-
-        if (ProjectUtils.context() == 'shot'){
-            $('[id^="shot-"]').removeClass('active');
-            $(this).parent().parent().addClass('active');
-        }
     });
 });