diff --git a/src/index-browser.ts b/src/index-browser.ts
index 3f7b21e..c51e686 100644
--- a/src/index-browser.ts
+++ b/src/index-browser.ts
@@ -70,6 +70,7 @@ export async function render<T extends Template>(
   };
 
   return {
+    ...within(container as any as HTMLElement),
     container,
     instance,
     emitted<N extends string = "*">(
@@ -132,7 +133,6 @@ export async function render<T extends Template>(
         logDOM(element, maxLength, options);
       }
     },
-    ...within(container as any as HTMLElement),
   } as const;
 }
 
diff --git a/src/index.ts b/src/index.ts
index bca2005..45c0447 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -83,6 +83,7 @@ export async function render<T extends Template>(
   Object.assign(screen, queries);
 
   return {
+    ...queries,
     container,
     get instance(): any {
       throw new Error(
@@ -110,7 +111,6 @@ export async function render<T extends Template>(
 
       cleanupComponent();
     },
-    ...queries,
   } as const;
 }