diff --git a/ui/CHANGELOG.md b/ui/CHANGELOG.md
index 6a384b133c..dc75f94e93 100644
--- a/ui/CHANGELOG.md
+++ b/ui/CHANGELOG.md
@@ -21,6 +21,7 @@ All notable changes to the **Prowler UI** are documented in this file.
 - Add compliance detail view: AWS Well-Architected Framework [(#7925)](https://github.com/prowler-cloud/prowler/pull/7925)
 - Add compliance detail view: KISA [(#7965)](https://github.com/prowler-cloud/prowler/pull/7965)
 - Add compliance detail view: ProwlerThreatScore [(#7966)](https://github.com/prowler-cloud/prowler/pull/7966)
+- Add compliance detail view: Generic (rest of the compliances) [(#7990)](https://github.com/prowler-cloud/prowler/pull/7990)
 - Improve `Scan ID` filter by adding more context and enhancing the UI/UX. [(#7979)](https://github.com/prowler-cloud/prowler/pull/7979)
 
 ### 🔄 Changed
diff --git a/ui/components/compliance/compliance-header/scan-selector.tsx b/ui/components/compliance/compliance-header/scan-selector.tsx
index 390bc669bc..4739633cc6 100644
--- a/ui/components/compliance/compliance-header/scan-selector.tsx
+++ b/ui/components/compliance/compliance-header/scan-selector.tsx
@@ -31,9 +31,12 @@ export const ScanSelector = ({
       size="lg"
       labelPlacement="outside"
       selectedKeys={new Set([selectedScanId])}
-      onSelectionChange={(keys) =>
-        onSelectionChange(Array.from(keys)[0] as string)
-      }
+      onSelectionChange={(keys) => {
+        const newSelectedId = Array.from(keys)[0] as string;
+        if (newSelectedId && newSelectedId !== selectedScanId) {
+          onSelectionChange(newSelectedId);
+        }
+      }}
       renderValue={() => {
         const selectedItem = scans.find((item) => item.id === selectedScanId);
         return selectedItem ? (