diff --git a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/debugger/Main.java b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/debugger/Main.java
index 39e616cfb43..915fbd5a413 100644
--- a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/debugger/Main.java
+++ b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/debugger/Main.java
@@ -1719,7 +1719,9 @@ class UpdateContext implements Runnable {
             toolTips.addElement(location);
         }
         db.context.enableUpdate();
-        ctx.setSelectedIndex(0);
+        if (frameCount != 0) {
+            ctx.setSelectedIndex(0);
+        }
         ctx.setMinimumSize(new Dimension(50, ctx.getMinimumSize().height));
     }
 };