diff --git a/packages/devtools-connection/src/debugger/client.js b/packages/devtools-connection/src/debugger/client.js
index 0589e8d01..a7946944d 100644
--- a/packages/devtools-connection/src/debugger/client.js
+++ b/packages/devtools-connection/src/debugger/client.js
@@ -2779,8 +2779,8 @@ ObjectClient.prototype = {
     },
     {
       before: function(packet) {
-        if (!["Map", "WeakMap", "Set", "WeakSet"].includes(this._grip.class)) {
-          throw new Error("enumEntries is only valid for Map/Set-like grips.");
+        if (!["Map", "WeakMap", "Set", "WeakSet", "Storage"].includes(this._grip.class)) {
+          throw new Error("enumEntries is only valid for Map/Set/Storage-like grips.");
         }
         return packet;
       },
diff --git a/packages/devtools-reps/src/object-inspector/utils/node.js b/packages/devtools-reps/src/object-inspector/utils/node.js
index e65a55f37..1f52e9845 100644
--- a/packages/devtools-reps/src/object-inspector/utils/node.js
+++ b/packages/devtools-reps/src/object-inspector/utils/node.js
@@ -251,7 +251,8 @@ function nodeHasEntries(
   return value.class === "Map"
     || value.class === "Set"
     || value.class === "WeakMap"
-    || value.class === "WeakSet";
+    || value.class === "WeakSet"
+    || value.class === "Storage";
 }
 
 function nodeHasAllEntriesInPreview(item : Node) : boolean {
diff --git a/packages/devtools-reps/src/reps/grip-map-entry.js b/packages/devtools-reps/src/reps/grip-map-entry.js
index 504a61508..223bf19e9 100644
--- a/packages/devtools-reps/src/reps/grip-map-entry.js
+++ b/packages/devtools-reps/src/reps/grip-map-entry.js
@@ -50,7 +50,9 @@ function supportsObject(grip, noGrip = false) {
   if (noGrip === true) {
     return false;
   }
-  return (grip && grip.type === "mapEntry" && grip.preview);
+  return grip &&
+         (grip.type === "mapEntry" || grip.type === "storageEntry") &&
+         grip.preview;
 }
 
 function createGripMapEntry(key, value) {