diff --git a/addons/web/static/src/js/core/registry.js b/addons/web/static/src/js/core/registry.js
index cf898c647ca..6089ccc827e 100644
--- a/addons/web/static/src/js/core/registry.js
+++ b/addons/web/static/src/js/core/registry.js
@@ -68,7 +68,12 @@ var Registry = Class.extend({
      * @returns {Object}
      */
     entries: function () {
-        return Object.create(this.map);
+        var entries = {};
+        var keys = this.keys();
+        for (var i = 0; i < keys.length; i++) {
+            entries[keys[i]] = this.map[keys[i]];
+        }
+        return entries;
     },
     /**
      * Returns the value associated to the given key.
@@ -105,7 +110,11 @@ var Registry = Class.extend({
     keys: function () {
         var self = this;
         if (!this._sortedKeys) {
-            this._sortedKeys = _.sortBy(Object.keys(this.map), function (key) {
+            var keys = [];
+            for (var key in this.map) {
+                keys.push(key);
+            }
+            this._sortedKeys = _.sortBy(keys, function (key) {
                 return self._scoreMapping[key] || 0;
             });
         }
diff --git a/addons/web/static/tests/core/registry_tests.js b/addons/web/static/tests/core/registry_tests.js
index f87238fafb8..fdc437c23ee 100644
--- a/addons/web/static/tests/core/registry_tests.js
+++ b/addons/web/static/tests/core/registry_tests.js
@@ -19,6 +19,27 @@ QUnit.module('core', {}, function () {
         assert.strictEqual(registry.get('foo'), foo);
     });
 
+    QUnit.test('get initial keys', function (assert) {
+        assert.expect(1);
+
+        var registry = new Registry({ a: 1, });
+        assert.deepEqual(
+            registry.keys(),
+            ['a'],
+            "keys on prototype should be returned"
+        );
+    });
+
+    QUnit.test('get initial entries', function (assert) {
+        assert.expect(1);
+
+        var registry = new Registry({ a: 1, });
+        assert.deepEqual(
+            registry.entries(),
+            { a: 1, },
+            "entries on prototype should be returned"
+        );
+    });
 
     QUnit.test('multiget', function (assert) {
         assert.expect(1);