diff --git a/packages/host/app/components/operator-mode/container.gts b/packages/host/app/components/operator-mode/container.gts
index e17cd05792..a294142b6d 100644
--- a/packages/host/app/components/operator-mode/container.gts
+++ b/packages/host/app/components/operator-mode/container.gts
@@ -56,6 +56,7 @@ interface Signature {
   Args: {
     onClose: () => void;
   };
+  Element: HTMLElement;
 }
 
 export default class OperatorModeContainer extends Component<Signature> {
@@ -143,7 +144,7 @@ export default class OperatorModeContainer extends Component<Signature> {
   }
 
   <template>
-    <div class='operator-mode'>
+    <div class='operator-mode' ...attributes>
       <ChooseFileModal />
       <CreateListingModal />
       <CreatePRModal />
diff --git a/packages/host/app/templates/index.gts b/packages/host/app/templates/index.gts
index 63b1749eed..2b677b5d8a 100644
--- a/packages/host/app/templates/index.gts
+++ b/packages/host/app/templates/index.gts
@@ -236,7 +236,10 @@ export class IndexComponent extends Component<IndexComponentComponentSignature>
       />
     {{else}}
       {{pageTitle this.operatorModeStateService.title}}
-      <OperatorModeContainer @onClose={{this.closeOperatorMode}} />
+      <OperatorModeContainer
+        @onClose={{this.closeOperatorMode}}
+        {{this.removeIsolatedMarkup}}
+      />
     {{/if}}
   </template>
 }