diff --git a/src/zen/split-view/ZenViewSplitter.mjs b/src/zen/split-view/ZenViewSplitter.mjs
index ec018dbad..c2bef1d38 100644
--- a/src/zen/split-view/ZenViewSplitter.mjs
+++ b/src/zen/split-view/ZenViewSplitter.mjs
@@ -1214,7 +1214,7 @@ class nsZenViewSplitter extends nsZenDOMOperatedFeature {
           return;
         }
         this.activateSplitView(group, true);
-        this.#dispatchItemEvent("ZenSplitViewTabsSplit", group);
+        this.#dispatchItemEvent("ZenSplitViewTabsSplit", group.tabs[0].group);
         // eslint-disable-next-line consistent-return
         return group;
       }
@@ -2075,6 +2075,9 @@ class nsZenViewSplitter extends nsZenDOMOperatedFeature {
 
     for (const groupData of data) {
       const group = document.getElementById(groupData.groupId);
+      if (!group) {
+        continue;
+      }
 
       // Backwards compatibility
       if (!groupData?.layoutTree) {
diff --git a/src/zen/split-view/zen-decks.css b/src/zen/split-view/zen-decks.css
index 212151bad..c9e52426f 100644
--- a/src/zen/split-view/zen-decks.css
+++ b/src/zen/split-view/zen-decks.css
@@ -59,6 +59,8 @@
 }
 
 #tabbrowser-tabpanels[zen-split-view='true']:not(.zen-split-view-no-transition):not([zen-split-resizing]) > [zen-split='true'] {
+  --zen-active-split-outline-color: light-dark(var(--zen-primary-color), var(--button-background-color-primary));
+
   transition: inset 0.09s ease-out !important;
   & browser {
     transition: opacity 0.2s ease-out !important;
@@ -67,7 +69,6 @@
 
 #tabbrowser-tabpanels[zen-split-view='true'] .browserSidebarContainer.deck-selected {
   &:not(.zen-glance-overlay) {
-    --zen-active-split-outline-color: light-dark(var(--zen-primary-color), var(--button-background-color-primary));
     outline: 2px solid var(--zen-active-split-outline-color) !important;
   }