diff --git a/static/js/managers/DownloadManager.js b/static/js/managers/DownloadManager.js
index 068aae8d..71578d26 100644
--- a/static/js/managers/DownloadManager.js
+++ b/static/js/managers/DownloadManager.js
@@ -754,7 +754,7 @@ export class DownloadManager {
             this.selectedFile?.id, this.selectedFile?.name, this.selectedFile?.type, this.selectedFile?.metadata);
 
         document.getElementById('fileSelectionStep').style.display = 'none';
-        document.getElementById('locationStep').style.display = 'block';
+        document.getElementById('downloadLocationStep').style.display = 'block';
         this.proceedToLocationContent();
     }
 
@@ -788,7 +788,7 @@ export class DownloadManager {
         }
 
         document.querySelectorAll('.download-step').forEach(step => step.style.display = 'none');
-        document.getElementById('locationStep').style.display = 'block';
+        document.getElementById('downloadLocationStep').style.display = 'block';
         await this.proceedToLocationContent();
     }
 
@@ -1563,7 +1563,7 @@ export class DownloadManager {
     }
 
     backToVersions() {
-        document.getElementById('locationStep').style.display = 'none';
+        document.getElementById('downloadLocationStep').style.display = 'none';
         if (this.isBatchMode) {
             document.getElementById('batchPreviewStep').style.display = 'block';
         } else {
diff --git a/static/js/managers/import/ImportStepManager.js b/static/js/managers/import/ImportStepManager.js
index 8af2978b..d5b8e47d 100644
--- a/static/js/managers/import/ImportStepManager.js
+++ b/static/js/managers/import/ImportStepManager.js
@@ -47,11 +47,8 @@ export class ImportStepManager {
                 targetStep.offsetHeight;
             }
             
-            // Reset scroll via class: 'locationStep' has a duplicate ID in downloadModal's
-            // template, so getElementById may not return the import modal's step.
-            document.querySelectorAll('.import-step').forEach(step => {
-                step.scrollTop = 0;
-            });
+            // Scroll the active step back to top (steps scroll independently of the modal shell)
+            targetStep.scrollTop = 0;
         }
     }
 }
diff --git a/templates/components/modals/download_modal.html b/templates/components/modals/download_modal.html
index b09acdb2..f92f3230 100644
--- a/templates/components/modals/download_modal.html
+++ b/templates/components/modals/download_modal.html
@@ -60,7 +60,7 @@
         </div>
 
         <!-- Step 3: Location Selection -->
-        <div class="download-step" id="locationStep" style="display: none;">
+        <div class="download-step" id="downloadLocationStep" style="display: none;">
             <div class="location-selection">
                 <!-- Path preview with inline toggle -->
                 <div class="path-preview">
diff --git a/tests/frontend/managers/downloadManager.latestVersion.test.js b/tests/frontend/managers/downloadManager.latestVersion.test.js
index 8abe69f8..ca137605 100644
--- a/tests/frontend/managers/downloadManager.latestVersion.test.js
+++ b/tests/frontend/managers/downloadManager.latestVersion.test.js
@@ -118,7 +118,7 @@ function setupDownloadDom() {
       <div class="download-step" id="urlStep"></div>
       <div class="download-step" id="versionStep"></div>
       <div class="download-step" id="fileSelectionStep"></div>
-      <div class="download-step" id="locationStep"></div>
+      <div class="download-step" id="downloadLocationStep"></div>
       <div id="batchPreviewStep"></div>
       <textarea id="modelUrl"></textarea>
       <div id="urlError"></div>