diff --git a/compose/neurosynth-frontend/src/components/EditStudyComponents/EditAnalyses/EditAnalyses.tsx b/compose/neurosynth-frontend/src/components/EditStudyComponents/EditAnalyses/EditAnalyses.tsx
index 73bbf3f8..f89f029a 100644
--- a/compose/neurosynth-frontend/src/components/EditStudyComponents/EditAnalyses/EditAnalyses.tsx
+++ b/compose/neurosynth-frontend/src/components/EditStudyComponents/EditAnalyses/EditAnalyses.tsx
@@ -28,6 +28,7 @@ const EditAnalyses: React.FC = React.memo((props) => {
         if (!createdAnalysis.id) return;
 
         createAnnotationNote(createdAnalysis.id, studyId, '');
+        setSelectedAnalysisId(createdAnalysis.id);
     };
 
     const handleSelectAnalysis = useCallback((analysisId: string) => {
diff --git a/compose/neurosynth-frontend/src/components/EditStudyComponents/EditAnalyses/EditAnalysesList/EditAnalysesListItem.tsx b/compose/neurosynth-frontend/src/components/EditStudyComponents/EditAnalyses/EditAnalysesList/EditAnalysesListItem.tsx
index 5201d579..1b173baa 100644
--- a/compose/neurosynth-frontend/src/components/EditStudyComponents/EditAnalyses/EditAnalysesList/EditAnalysesListItem.tsx
+++ b/compose/neurosynth-frontend/src/components/EditStudyComponents/EditAnalyses/EditAnalysesList/EditAnalysesListItem.tsx
@@ -27,6 +27,7 @@ const EditAnalysesListItem: React.FC<{
     return (
         <ListItem disablePadding divider>
             <ListItemButton
+                autoFocus={selected}
                 sx={{ minHeight: '49px' }}
                 onClick={handleSelectAnalysis}
                 selected={selected}