diff --git a/mozilla/browser/components/search/content/engineManager.js b/mozilla/browser/components/search/content/engineManager.js
index 7c65cb213f7..6a34095b346 100644
--- a/mozilla/browser/components/search/content/engineManager.js
+++ b/mozilla/browser/components/search/content/engineManager.js
@@ -104,7 +104,7 @@ var gEngineManagerDialog = {
     gEngineView.rowCountChanged(index, -1);
     gEngineView.invalidate();
     gEngineView.selection.select(Math.min(index, gEngineView.lastIndex));
-    gEngineView.ensureRowIsVisible(index);
+    gEngineView.ensureRowIsVisible(Math.min(index, gEngineView.lastIndex));
     document.getElementById("engineList").focus();
   },
 
@@ -121,7 +121,7 @@ var gEngineManagerDialog = {
 
     gEngineView.invalidate();
     gEngineView.selection.select(newIndex);
-    gEngineView.ensureRowIsVisible(index);
+    gEngineView.ensureRowIsVisible(newIndex);
     document.getElementById("engineList").focus();
   },