diff --git a/ui/src/components/SampleQueue/TodoTree.js b/ui/src/components/SampleQueue/TodoTree.js
index 502842734..58bb6bdd0 100644
--- a/ui/src/components/SampleQueue/TodoTree.js
+++ b/ui/src/components/SampleQueue/TodoTree.js
@@ -19,7 +19,6 @@ export default class TodoTree extends React.Component {
   showAddSampleForm() {
     this.props.sendPrepareForNewSample();
     this.props.showForm('AddSample');
-    this.props.showList('current');
   }
 
   mountAndSwitchTab(sampleData) {
diff --git a/ui/src/components/Tasks/AddSample.js b/ui/src/components/Tasks/AddSample.js
index 689d6b4a3..fb2843c5b 100644
--- a/ui/src/components/Tasks/AddSample.js
+++ b/ui/src/components/Tasks/AddSample.js
@@ -7,6 +7,8 @@ import validate from './validate_add_sample';
 import { bindActionCreators } from 'redux';
 import { addSamplesToList } from '../../actions/sampleGrid';
 import { addSampleAndMount, addSamplesToQueue } from '../../actions/queue';
+import { showList } from '../../actions/queueGUI';
+import { useLocation } from 'react-router-dom';
 
 function getDefaultSampleData(params) {
   let prefix = params.sampleName ? params.sampleName : 'noname';
@@ -34,12 +36,20 @@ function AddSample(props) {
     addSamplesToList,
     addSampleAndMount,
     addSamplesToQueue,
+    showList,
   } = props;
 
+  const { pathname } = useLocation();
+
   function addAndMount(params) {
     const sampleData = getDefaultSampleData(params);
     addSamplesToList([sampleData]);
     addSampleAndMount(sampleData);
+
+    if (pathname === '/datacollection') {
+      showList('current');
+    }
+
     hide();
   }
 
@@ -65,7 +75,7 @@ function AddSample(props) {
           <FieldsRow>
             <InputField
               propName="sampleName"
-              autoFocus
+                autoFocus // eslint-disable-line jsx-a11y/no-autofocus
               label="Sample Name"
               col1="4"
               col2="6"
@@ -112,6 +122,7 @@ const AddSampleContainer = connect(
     addSamplesToList: bindActionCreators(addSamplesToList, dispatch),
     addSamplesToQueue: bindActionCreators(addSamplesToQueue, dispatch),
     addSampleAndMount: bindActionCreators(addSampleAndMount, dispatch),
+    showList: bindActionCreators(showList, dispatch),
   }),
 )(AddSampleForm);