diff --git a/package.json b/package.json
index a9d690d9..1eb088a2 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
     "pretest:unit": "tsx tests/scripts/generate-story-imports.ts",
     "test:unit": "vitest run",
     "test:unit:watch": "vitest --browser.headless=false",
-    "watch": "xs watch",
+    "watch": "vite build --watch",
     "prepare": "husky"
   },
   "lint-staged": {
diff --git a/src/components/LayoutContainer.ts b/src/components/LayoutContainer.ts
index 6b67b152..c299b7d5 100644
--- a/src/components/LayoutContainer.ts
+++ b/src/components/LayoutContainer.ts
@@ -254,7 +254,11 @@ export class LayoutContainer extends Container {
      * @protected
      */
     protected _drawBackground(computedLayout: ComputedLayout) {
-        const borderWidth = this.layout!.yoga.getBorder(Edge.All);
+        let borderWidth = this.layout!.yoga.getBorder(Edge.All);
+
+        if (isNaN(borderWidth) || borderWidth < 0) {
+            borderWidth = 0;
+        }
         const boxSizing = this.layout!.yoga.getBoxSizing();
         const alignment = boxSizing === BoxSizing.BorderBox ? 1 : 0;