1 files changed, 25 insertions, 1 deletions

diff --git a/packages/main/src/stores/Service.ts b/packages/main/src/stores/Service.ts
index 1d46dc9..8ba8098 100644
--- a/packages/main/src/stores/Service.ts
+++ b/packages/main/src/stores/Service.ts
@@ -25,6 +25,7 @@ import {
   defineServiceModel,
   ServiceAction,
   type ServiceStateSnapshotIn,
+  type BrowserViewBounds,
 } from '@sophie/shared';
 import { type Instance, getSnapshot, cast, flow } from 'mobx-state-tree';
 
@@ -41,8 +42,18 @@ const Service = defineServiceModel(ServiceSettings)
   .volatile(
     (): {
       serviceView: ServiceView | undefined;
+      x: number;
+      y: number;
+      width: number;
+      height: number;
+      hasBounds: boolean;
     } => ({
       serviceView: undefined,
+      x: 0,
+      y: 0,
+      width: 0,
+      height: 0,
+      hasBounds: false,
     }),
   )
   .views((self) => ({
@@ -59,10 +70,20 @@ const Service = defineServiceModel(ServiceSettings)
   }))
   .views((self) => ({
     get shouldBeVisible(): boolean {
-      return self.shouldBeLoaded && !self.hasError;
+      // Do not attach service views for which we don't know the appropriate frame size,
+      // because they will just appear in a random location until the frame size is determined.
+      return self.shouldBeLoaded && !self.hasError && self.hasBounds;
     },
   }))
   .actions((self) => ({
+    setBrowserViewBounds(bounds: BrowserViewBounds): void {
+      self.x = bounds.x;
+      self.y = bounds.y;
+      self.width = bounds.width;
+      self.height = bounds.height;
+      self.hasBounds = true;
+      self.serviceView?.updateBounds();
+    },
     setServiceView(serviceView: ServiceView | undefined): void {
       self.serviceView = serviceView;
     },
@@ -263,6 +284,9 @@ const Service = defineServiceModel(ServiceSettings)
   .actions((self) => ({
     dispatch(action: ServiceAction): void {
       switch (action.action) {
+        case 'set-browser-view-bounds':
+          self.setBrowserViewBounds(action.browserViewBounds);
+          break;
         case 'back':
           self.goBack();
           break;