diff --git a/src/app/(protected)/workorders/_components/list/table/cells/status-cell.tsx b/src/app/(protected)/workorders/_components/list/table/cells/status-cell.tsx
index 28049593..67d826ee 100644
--- a/src/app/(protected)/workorders/_components/list/table/cells/status-cell.tsx
+++ b/src/app/(protected)/workorders/_components/list/table/cells/status-cell.tsx
@@ -1,46 +1,28 @@
 import { useState } from "react";
-
 import { AlertTriangle, Check } from "lucide-react";
-
 import { Popover } from "@mui/material";
 import { Text } from "@/components/ui/text";
-
 import {
   ALL_WIZARD_STATUSES,
   type WizardWOStatus,
 } from "@/domain/work-orders/types/work-order-wizard";
-
 import type { WorkOrderTableRow } from "@/domain/work-orders/types/work-order-table-row";
 import {
   formatClosabilityMissingTitle,
   getClosabilityGaps,
 } from "@/domain/work-orders/utils/wo-closability";
-
 import { HoverChevron } from "./hover-chevron";
-
 import { WoTableStatusLabel } from "./wo-table-status-label";
 
 type StatusCellProps = {
   wo: WorkOrderTableRow;
-
   onChangeStatus: (status: WizardWOStatus) => void;
-
   onOpenSlideOver: () => void;
-
   onPastDueAttempt?: () => void;
 };
 
-export function StatusCell({
-  wo,
-
-  onChangeStatus,
-
-  onOpenSlideOver,
-
-  onPastDueAttempt,
-}: StatusCellProps) {
-  const [anchorEl, setAnchorEl] = useState<HTMLElement | null>(null);
-  const closabilityGaps = getClosabilityGaps({
+function rowClosabilityGaps(wo: WorkOrderTableRow) {
+  return getClosabilityGaps({
     dispatcherId: wo.dispatcherId,
     dispatcherName: wo.dispatcherName,
     tech: wo.tech,
@@ -53,73 +35,91 @@ export function StatusCell({
     upliftSummary: wo.upliftSummary,
     hasPendingUplift: wo.hasPendingUplift,
   });
+}
+
+function PastDueStatusCell({
+  onOpenSlideOver,
+  onPastDueAttempt,
+}: {
+  onOpenSlideOver: () => void;
+  onPastDueAttempt?: () => void;
+}) {
+  const [anchorEl, setAnchorEl] = useState<HTMLElement | null>(null);
+
+  return (
+    <>
+      <button
+        type="button"
+        onClick={(e) => {
+          e.stopPropagation();
+          onPastDueAttempt?.();
+          setAnchorEl(e.currentTarget);
+        }}
+        title="This WO missed its deadline. Update the Due Date to unlock status updates."
+        className="group/cell flex w-full cursor-pointer items-center gap-1.5 whitespace-nowrap leading-none transition-opacity hover:opacity-80"
+        style={{ fontSize: 12.5, fontWeight: 600, color: "var(--status-pastdue-text)" }}
+      >
+        <span className="h-2 w-2 shrink-0 rounded-full bg-[#BE123C]" />
+        Past Due
+        <HoverChevron />
+      </button>
+
+      <Popover
+        open={Boolean(anchorEl)}
+        anchorEl={anchorEl}
+        onClose={() => setAnchorEl(null)}
+        anchorOrigin={{ vertical: "bottom", horizontal: "left" }}
+        onClick={(e) => e.stopPropagation()}
+        slotProps={{
+          paper: { className: "w-[264px] overflow-hidden rounded-lg border border-border p-0" },
+        }}
+      >
+        <div
+          className="flex items-start gap-2 p-3"
+          style={{ background: "var(--status-pending-bg)" }}
+        >
+          <AlertTriangle size={13} className="mt-0.5 shrink-0 text-[var(--warning)]" />
+          <div>
+            <Text
+              as="p"
+              style={{
+                fontSize: 11,
+                lineHeight: 1.375,
+                color: "var(--status-pending-text)",
+              }}
+            >
+              This work order is past due. Update the Due Date before the status can be updated.
+            </Text>
+            <button
+              type="button"
+              onClick={(e) => {
+                e.stopPropagation();
+                onOpenSlideOver();
+                setAnchorEl(null);
+              }}
+              className="mt-2 block text-[11px] font-medium text-[var(--color-primary)]"
+            >
+              Update Due Date →
+            </button>
+          </div>
+        </div>
+      </Popover>
+    </>
+  );
+}
+
+export function StatusCell({
+  wo,
+  onChangeStatus,
+  onOpenSlideOver,
+  onPastDueAttempt,
+}: StatusCellProps) {
+  const [anchorEl, setAnchorEl] = useState<HTMLElement | null>(null);
+  const closabilityGaps = rowClosabilityGaps(wo);
 
   if (wo.isPastDue) {
     return (
-      <>
-        <button
-          type="button"
-          onClick={(e) => {
-            e.stopPropagation();
-
-            onPastDueAttempt?.();
-
-            setAnchorEl(e.currentTarget);
-          }}
-          title="This WO missed its deadline. Update the Due Date to unlock status updates."
-          className="group/cell flex w-full cursor-pointer items-center gap-1.5 whitespace-nowrap leading-none transition-opacity hover:opacity-80"
-          style={{ fontSize: 12.5, fontWeight: 600, color: "var(--status-pastdue-text)" }}
-        >
-          <span className="h-2 w-2 shrink-0 rounded-full bg-[#BE123C]" />
-          Past Due
-          <HoverChevron />
-        </button>
-
-        <Popover
-          open={Boolean(anchorEl)}
-          anchorEl={anchorEl}
-          onClose={() => setAnchorEl(null)}
-          anchorOrigin={{ vertical: "bottom", horizontal: "left" }}
-          onClick={(e) => e.stopPropagation()}
-          slotProps={{
-            paper: { className: "w-[264px] overflow-hidden rounded-lg border border-border p-0" },
-          }}
-        >
-          <div
-            className="flex items-start gap-2 p-3"
-            style={{ background: "var(--status-pending-bg)" }}
-          >
-            <AlertTriangle size={13} className="mt-0.5 shrink-0 text-[var(--warning)]" />
-
-            <div>
-              <Text
-                as="p"
-                style={{
-                  fontSize: 11,
-                  lineHeight: 1.375,
-                  color: "var(--status-pending-text)",
-                }}
-              >
-                This work order is past due. Update the Due Date before the status can be updated.
-              </Text>
-
-              <button
-                type="button"
-                onClick={(e) => {
-                  e.stopPropagation();
-
-                  onOpenSlideOver();
-
-                  setAnchorEl(null);
-                }}
-                className="mt-2 block text-[11px] font-medium text-[var(--color-primary)]"
-              >
-                Update Due Date →
-              </button>
-            </div>
-          </div>
-        </Popover>
-      </>
+      <PastDueStatusCell onOpenSlideOver={onOpenSlideOver} onPastDueAttempt={onPastDueAttempt} />
     );
   }
 
@@ -129,7 +129,6 @@ export function StatusCell({
         type="button"
         onClick={(e) => {
           e.stopPropagation();
-
           setAnchorEl(e.currentTarget);
         }}
         className="group/cell flex w-full items-center gap-1 transition-opacity hover:opacity-80"
@@ -139,7 +138,6 @@ export function StatusCell({
         ) : (
           <span className="text-[11px] text-[var(--color-text-muted)]">—</span>
         )}
-
         <HoverChevron />
       </button>
 
@@ -177,8 +175,7 @@ export function StatusCell({
               }
             >
               <WoTableStatusLabel status={status} />
-
-              {wo.status === status && (
+              {Boolean(wo.status === status) && (
                 <Check size={10} className="ml-auto text-[var(--color-primary)]" />
               )}
             </button>