diff --git a/attract/tasks/routes.py b/attract/tasks/routes.py
index 13d04cb..71a7f59 100644
--- a/attract/tasks/routes.py
+++ b/attract/tasks/routes.py
@@ -100,7 +100,8 @@ def view_task(project, attract_props, task_id):
                            task=task,
                            project=project,
                            task_node_type=node_type,
-                           attract_props=attract_props.to_dict())
+                           attract_props=attract_props.to_dict(),
+                           attract_context=request.args.get('context'))
 
 
 @perproject_blueprint.route('/<task_id>', methods=['POST'])
diff --git a/src/scripts/tutti/10_tasks.js b/src/scripts/tutti/10_tasks.js
index 0e29d62..b098256 100644
--- a/src/scripts/tutti/10_tasks.js
+++ b/src/scripts/tutti/10_tasks.js
@@ -43,6 +43,7 @@ function item_open(item_id, item_type, pushState, project_url)
     if (ProjectUtils.context() == 'shot' && item_type == 'task'){
         push_url = '/attract/' + project_url + '/shots/with-task/' + item_id;
     }
+    item_url += '?context=' + ProjectUtils.context();
 
     $('#status-bar').text('Loading ' + item_type + '…');
 
diff --git a/src/templates/attract/tasks/view_task_embed.jade b/src/templates/attract/tasks/view_task_embed.jade
index 1049c7a..bb410b9 100644
--- a/src/templates/attract/tasks/view_task_embed.jade
+++ b/src/templates/attract/tasks/view_task_embed.jade
@@ -25,6 +25,12 @@
 						a(href="javascript:void(0)")
 							i.pi-clipboard-copy
 							| Copy ID to Clipboard
+					| {% if attract_context != 'shot' and task.parent %}
+					li
+						a(href="{{ url_for('attract.shots.perproject.with_task', project_url=project['url'], task_id=task['_id']) }}")
+							i.pi-film-thick
+							| View in shot context
+					| {% endif %}
 					| {% if 'DELETE' in task.allowed_methods %}
 					li.divider(role='separator')
 					li.item-delete