diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java b/mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java
index 966d94aef86..ec493b88828 100644
--- a/mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java
+++ b/mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java
@@ -1951,6 +1951,12 @@ public class ScriptRuntime {
         } else if (type == FunctionNode.FUNCTION_EXPRESSION_STATEMENT) {
             String name = function.functionName;
             if (name != null && name.length() != 0) {
+                // Always put function expression statements into initial
+                // activation object ignoring the with statement to follow
+                // SpiderMonkey
+                while (scope instanceof NativeWith) {
+                    scope = scope.getParentScope();
+                }
                 scope.put(name, scope, function);
             }
         }