diff --git a/app/classifier/tasks/combo/editor.cjsx b/app/classifier/tasks/combo/editor.cjsx
index 323c43982f..1159817664 100644
--- a/app/classifier/tasks/combo/editor.cjsx
+++ b/app/classifier/tasks/combo/editor.cjsx
@@ -7,6 +7,7 @@ ComboTaskEditor = createReactClass
   getDefaultProps: ->
     workflow: null
     task: null
+    taskPrefix: ''
     onChange: ->
 
   componentWillMount: () ->
@@ -47,6 +48,7 @@ ComboTaskEditor = createReactClass
     </li>
 
   render: ->
+    [root, taskKey] = @props.taskPrefix.split '.'
     tasks = require('..').default
     <div>
       <p>Add any number of tasks here and they'll be shown in one step.</p>
@@ -77,7 +79,7 @@ ComboTaskEditor = createReactClass
       <p>
         <label>
           Next task:{' '}
-          <NextTaskSelector task={@props.task} workflow={@props.workflow} value={@props.task.next} onChange={@setNextTask} />
+          <NextTaskSelector taskKey={taskKey} workflow={@props.workflow} value={@props.task.next} onChange={@setNextTask} />
         </label>
         <br />
         <span className="form-help">This overrides anything set by a sub-task.</span>
diff --git a/app/classifier/tasks/dropdown/editor.jsx b/app/classifier/tasks/dropdown/editor.jsx
index d77bd47d8c..41b42a6479 100644
--- a/app/classifier/tasks/dropdown/editor.jsx
+++ b/app/classifier/tasks/dropdown/editor.jsx
@@ -120,6 +120,7 @@ export default class DropdownEditor extends React.Component {
   }
 
   render() {
+    const [root, taskKey] = this.props.taskPrefix.split('.');
     const handleChange = handleInputChange.bind(this.props.workflow);
 
     const selects = this.props.task.selects;
@@ -218,7 +219,7 @@ export default class DropdownEditor extends React.Component {
           <span className="form-label">Next task</span>
           <br />
           <NextTaskSelector
-            task={this.props.task}
+            taskKey={taskKey}
             workflow={this.props.workflow}
             name={`${this.props.taskPrefix}.next`}
             value={this.props.task.next || ''}
@@ -248,5 +249,6 @@ DropdownEditor.propTypes = {
 
 DropdownEditor.defaultProps = {
   task: {},
+  taskPrefix: '',
   workflow: {}
 };
diff --git a/app/classifier/tasks/generic-editor.cjsx b/app/classifier/tasks/generic-editor.cjsx
index 009e19e95d..69baa9ae05 100644
--- a/app/classifier/tasks/generic-editor.cjsx
+++ b/app/classifier/tasks/generic-editor.cjsx
@@ -37,6 +37,7 @@ module.exports = createReactClass
     taskPrefix: ''
 
   render: ->
+    [root, taskKey] = @props.taskPrefix.split '.'
     handleChange = handleInputChange.bind @props.workflow
 
     [mainTextKey, choicesKey] = switch @props.task.type
@@ -130,7 +131,7 @@ module.exports = createReactClass
                       <div className="workflow-choice-setting">
                         <AutoSave resource={@props.workflow}>
                           Next task{' '}
-                          <NextTaskSelector task={@props.task} workflow={@props.workflow} name="#{@props.taskPrefix}.#{choicesKey}.#{index}.next" value={choice.next ? ''} onChange={handleChange} />
+                          <NextTaskSelector taskKey={taskKey} workflow={@props.workflow} name="#{@props.taskPrefix}.#{choicesKey}.#{index}.next" value={choice.next ? ''} onChange={handleChange} />
                         </AutoSave>
                       </div>
 
@@ -304,7 +305,7 @@ module.exports = createReactClass
         <div>
           <AutoSave resource={@props.workflow}>
             Next task{' '}
-            <NextTaskSelector task={@props.task} workflow={@props.workflow} name="#{@props.taskPrefix}.next" value={@props.task.next ? ''} onChange={handleChange} />
+            <NextTaskSelector taskKey={taskKey} workflow={@props.workflow} name="#{@props.taskPrefix}.next" value={@props.task.next ? ''} onChange={handleChange} />
           </AutoSave>
         </div>}
     </div>
diff --git a/app/classifier/tasks/next-task-selector.cjsx b/app/classifier/tasks/next-task-selector.cjsx
index 796da49f88..76f54ce1d0 100644
--- a/app/classifier/tasks/next-task-selector.cjsx
+++ b/app/classifier/tasks/next-task-selector.cjsx
@@ -21,7 +21,7 @@ module.exports = createReactClass
     <select name={@props.name} value={@props.value} onChange={@props.onChange}>
       <option value="">(Submit classification and load next subject)</option>
       {for key, definition of @props.workflow.tasks
-        unless definition.type is 'shortcut' or definition is @props.task
+        unless definition.type is 'shortcut' or key is @props.taskKey
           text = tasks[definition.type]?.getTaskText definition
           if text and text.length > MAX_TEXT_LENGTH_IN_MENU
             text = text[0...MAX_TEXT_LENGTH_IN_MENU] + '...'
diff --git a/app/classifier/tasks/slider/editor.jsx b/app/classifier/tasks/slider/editor.jsx
index d51b9cd286..52aebe675d 100644
--- a/app/classifier/tasks/slider/editor.jsx
+++ b/app/classifier/tasks/slider/editor.jsx
@@ -7,6 +7,7 @@ import handleInputChange from '../../../lib/handle-input-change';
 import NextTaskSelector from '../next-task-selector';
 
 const SliderTaskEditor = (props) => {
+  const [root, taskKey] = props.taskPrefix.split('.');
   const handleChange = handleInputChange.bind(props.workflow);
   let nextTask;
   let helpBox;
@@ -16,7 +17,7 @@ const SliderTaskEditor = (props) => {
         <span className="form-label">Next task</span>
         <br />
         <NextTaskSelector
-          task={props.task}
+          taskKey={taskKey}
           workflow={props.workflow}
           name={`${props.taskPrefix}.next`}
           value={props.task.next ? props.task.next : ''}
diff --git a/app/classifier/tasks/survey/editor.cjsx b/app/classifier/tasks/survey/editor.cjsx
index 9f5968e1db..b9db2ff6d6 100644
--- a/app/classifier/tasks/survey/editor.cjsx
+++ b/app/classifier/tasks/survey/editor.cjsx
@@ -41,6 +41,7 @@ module.exports = createReactClass
         task: JSON.parse JSON.stringify nextProps.task
 
   render: ->
+    [root, taskKey] = @props.taskPrefix.split '.'
     contentWarnings = @checkContentWarnings()
 
     <div className="workflow-task-editor">
@@ -223,7 +224,7 @@ module.exports = createReactClass
         <AutoSave resource={@props.workflow}>
           <span className="form-label">Next task</span>
           <br />
-          <NextTaskSelector task={@props.task} workflow={@props.workflow} name="#{@props.taskPrefix}.next" value={@props.task.next ? ''} onChange={handleInputChange.bind @props.workflow} />
+          <NextTaskSelector taskKey={taskKey} workflow={@props.workflow} name="#{@props.taskPrefix}.next" value={@props.task.next ? ''} onChange={handleInputChange.bind @props.workflow} />
         </AutoSave>
       </p>
 
diff --git a/app/classifier/tasks/text/editor.cjsx b/app/classifier/tasks/text/editor.cjsx
index 5ec63c6a30..6d30b750f0 100644
--- a/app/classifier/tasks/text/editor.cjsx
+++ b/app/classifier/tasks/text/editor.cjsx
@@ -12,6 +12,7 @@ module.exports = createReactClass
   getDefaultProps: ->
     workflow: {}
     task: {}
+    taskPrefix: ''
 
   tagExists:(tag) ->
     if @props.task.text_tags
@@ -31,6 +32,7 @@ module.exports = createReactClass
 
 
   render: ->
+    [root, taskKey] = @props.taskPrefix.split '.'
     handleChange = handleInputChange.bind @props.workflow
     requiredHelp = 'Check this box if this question has to be answered before proceeding. If a marking task is Required, the volunteer will not be able to move on until they have made at least 1 mark.'
 
@@ -86,6 +88,6 @@ module.exports = createReactClass
         <AutoSave resource={@props.workflow}>
           <span className="form-label">Next task</span>
           <br />
-          <NextTaskSelector task={@props.task} workflow={@props.workflow} name="#{@props.taskPrefix}.next" value={@props.task.next ? ''} onChange={handleInputChange.bind @props.workflow} />
+          <NextTaskSelector taskKey={taskKey} workflow={@props.workflow} name="#{@props.taskPrefix}.next" value={@props.task.next ? ''} onChange={handleInputChange.bind @props.workflow} />
         </AutoSave>}
     </div>
diff --git a/app/classifier/tasks/textFromSubject/editor.jsx b/app/classifier/tasks/textFromSubject/editor.jsx
index 2f29778589..94b0f83d45 100644
--- a/app/classifier/tasks/textFromSubject/editor.jsx
+++ b/app/classifier/tasks/textFromSubject/editor.jsx
@@ -11,6 +11,7 @@ export default function TextFromSubjectEditor({
   taskPrefix,
   workflow
 }) {
+  const [root, taskKey] = taskPrefix.split('.');
   const handleChange = handleInputChange.bind(workflow);
 
   return (
@@ -64,7 +65,7 @@ export default function TextFromSubjectEditor({
         </span>
         <br />
         <NextTaskSelector
-          task={task}
+          taskKey={taskKey}
           workflow={workflow}
           name={`${taskPrefix}.next`}
           value={task.next}