diff --git a/src/common.js b/src/common.js
index bf0cc30cc0..b7da320832 100644
--- a/src/common.js
+++ b/src/common.js
@@ -92,6 +92,10 @@
             alwaysask = false;
         }
         var prm = jQuery.Deferred();
+        if (jQuery.isEmptyObject(values)) {
+            prm.fail();
+            return prm;
+        }
         var keys = Object.keys(values).sort();
         if ((keys.length == 1) && (!alwaysask)) {
             var key = keys[0];
diff --git a/src/screen.js b/src/screen.js
index f812d8b570..909b9755a1 100644
--- a/src/screen.js
+++ b/src/screen.js
@@ -863,7 +863,7 @@
                     'model': this.model_name,
                     'id': this.get_id(),
                     'ids': [this.get_id()]
-                    }, jQuery.extend({}, this.context));
+                    }, jQuery.extend({}, this.context), false);
             } else {
                 this.switch_view('form');
             }