diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py
index 3767072ff9d..6fc12fab1bb 100644
--- a/addons/web/__openerp__.py
+++ b/addons/web/__openerp__.py
@@ -15,7 +15,7 @@
         "static/lib/datejs/parser.js",
         "static/lib/datejs/sugarpak.js",
         "static/lib/datejs/extras.js",
-        "static/lib/jquery/jquery-1.6.4.js",
+        "static/lib/jquery/jquery-1.7.1.js",
         "static/lib/jquery.MD5/jquery.md5.js",
         "static/lib/jquery.form/jquery.form.js",
         "static/lib/jquery.validate/jquery.validate.js",
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index e27ffce588d..e8f15c2ccf9 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -132,18 +132,21 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
     },
 
     do_show: function () {
-        var promise;
-        if (this.dataset.index === null) {
-            // null index means we should start a new record
-            promise = this.on_button_new();
-        } else {
-            promise = this.dataset.read_index(_.keys(this.fields_view.fields)).pipe(this.on_record_loaded);
-        }
-        this.$element.show();
-        if (this.sidebar) {
-            this.sidebar.$element.show();
-        }
-        return promise;
+        var self = this,
+            deferred = $.Deferred();
+        this.has_been_loaded.then(function() {
+            if (self.dataset.index === null) {
+                // null index means we should start a new record
+                deferred.pipe(self.on_button_new());
+            } else {
+                deferred.pipe(self.dataset.read_index(_.keys(self.fields_view.fields)).pipe(self.on_record_loaded));
+            }
+            self.$element.show();
+            if (self.sidebar) {
+                self.sidebar.$element.show();
+            }
+        });
+        return deferred;
     },
     do_hide: function () {
         this._super();