From ed3c7037a595a668d7a52e07a4f495bec1e9058e Mon Sep 17 00:00:00 2001
From: RachelElysia <71795832+RachelElysia@users.noreply.github.com>
Date: Fri, 10 May 2024 16:30:30 -0400
Subject: [PATCH] [released bug] Fleet UI: Final piece to keep form state when
 toggling new policy modal (#18917)

Co-authored-by: Sarah Gillespie <73313222+gillespi314@users.noreply.github.com>
---
 .../PolicyPage/components/PolicyForm/PolicyForm.tsx        | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/frontend/pages/policies/PolicyPage/components/PolicyForm/PolicyForm.tsx b/frontend/pages/policies/PolicyPage/components/PolicyForm/PolicyForm.tsx
index 65bb75e3af..d53ee4174e 100644
--- a/frontend/pages/policies/PolicyPage/components/PolicyForm/PolicyForm.tsx
+++ b/frontend/pages/policies/PolicyPage/components/PolicyForm/PolicyForm.tsx
@@ -246,10 +246,9 @@ const PolicyForm = ({
       });
     }
 
-    let selectedPlatforms: OsqueryPlatform[] = [];
-    if (isEditMode || defaultPolicy) {
-      selectedPlatforms = getSelectedPlatforms();
-    } else {
+    let selectedPlatforms = getSelectedPlatforms();
+    if (selectedPlatforms.length === 0 && !isEditMode && !defaultPolicy) {
+      // If no platforms are selected, default to all compatible platforms
       selectedPlatforms = getCompatiblePlatforms();
       setSelectedPlatforms(selectedPlatforms);
     }