diff --git a/toolkit/mozapps/downloads/content/downloads.js b/toolkit/mozapps/downloads/content/downloads.js
index 732bb8d1c89..eedc71fd14f 100644
--- a/toolkit/mozapps/downloads/content/downloads.js
+++ b/toolkit/mozapps/downloads/content/downloads.js
@@ -225,9 +225,9 @@ function resumeDownload(aDownload)
 function removeDownload(aDownload)
 {
   gDownloadManager.removeDownload(aDownload.getAttribute("dlid"));
-  var newIndex = Math.max(gDownloadsView.selectedIndex - 1, 0);
+  let index = gDownloadsView.selectedIndex;
   gDownloadsView.removeChild(aDownload);
-  gDownloadsView.selectedIndex = newIndex;
+  gDownloadsView.selectedIndex = Math.min(index, gDownloadsView.itemCount - 1);
 }
 
 function showDownload(aDownload)