diff --git a/src/model.js b/src/model.js
index 065dd5a063..3887986f17 100644
--- a/src/model.js
+++ b/src/model.js
@@ -1019,8 +1019,9 @@
         },
         expr_eval: function(expr) {
             if (typeof(expr) != 'string') return expr;
-            var ctx = jQuery.extend({}, this.get_context());
-            ctx.context = jQuery.extend({}, this.model.session.context, ctx);
+            var ctx = jQuery.extend({}, this.model.session.context);
+            ctx.context = jQuery.extend({}, ctx.context);
+            jQuery.extend(ctx.context, this.get_context());
             jQuery.extend(ctx, this.get_eval());
             ctx.active_model = this.model.name;
             ctx.active_id = this.id;