diff --git a/src/extension-support/extension-manager.js b/src/extension-support/extension-manager.js
index d9dc3603e..ef3d56aa8 100644
--- a/src/extension-support/extension-manager.js
+++ b/src/extension-support/extension-manager.js
@@ -116,7 +116,9 @@ class ExtensionManager {
 
             const extension = builtinExtensions[extensionURL];
             const extensionInstance = new extension(this.runtime);
-            return this._registerInternalExtension(extensionInstance);
+            return this._registerInternalExtension(extensionInstance).then(() => {
+                this._loadedExtensions.add(extensionURL);
+            });
         }
 
         return new Promise((resolve, reject) => {