diff --git a/dom/indexedDB/Client.cpp b/dom/indexedDB/Client.cpp
index 2ed73d55e22..a1ef7322878 100644
--- a/dom/indexedDB/Client.cpp
+++ b/dom/indexedDB/Client.cpp
@@ -84,6 +84,12 @@ Client::InitOrigin(const nsACString& aOrigin, UsageRunnable* aUsageRunnable)
       continue;
     }
 
+#ifdef XP_MACOSX
+    if (leafName.EqualsLiteral(DSSTORE_FILE_NAME)) {
+      continue;
+    }
+#endif
+
     bool isDirectory;
     rv = file->IsDirectory(&isDirectory);
     NS_ENSURE_SUCCESS(rv, rv);
diff --git a/dom/quota/QuotaCommon.h b/dom/quota/QuotaCommon.h
index 6b567d204f3..25e59c4a09b 100644
--- a/dom/quota/QuotaCommon.h
+++ b/dom/quota/QuotaCommon.h
@@ -20,6 +20,8 @@
 #define USING_QUOTA_NAMESPACE \
   using namespace mozilla::dom::quota;
 
+#define DSSTORE_FILE_NAME ".DS_Store"
+
 BEGIN_QUOTA_NAMESPACE
 
 #ifdef DEBUG
diff --git a/dom/quota/QuotaManager.cpp b/dom/quota/QuotaManager.cpp
index ca62e79d762..ed95c10c0df 100644
--- a/dom/quota/QuotaManager.cpp
+++ b/dom/quota/QuotaManager.cpp
@@ -907,6 +907,12 @@ QuotaManager::EnsureOriginIsInitialized(const nsACString& aOrigin,
       continue;
     }
 
+#ifdef XP_MACOSX
+    if (leafName.EqualsLiteral(DSSTORE_FILE_NAME)) {
+      continue;
+    }
+#endif
+
     bool isDirectory;
     rv = file->IsDirectory(&isDirectory);
     NS_ENSURE_SUCCESS(rv, rv);
@@ -2063,6 +2069,12 @@ AsyncUsageRunnable::RunInternal()
             continue;
           }
 
+#ifdef XP_MACOSX
+          if (leafName.EqualsLiteral(DSSTORE_FILE_NAME)) {
+            continue;
+          }
+#endif
+
           if (!initialized) {
             bool isDirectory;
             rv = file->IsDirectory(&isDirectory);