diff --git a/frontend/src/billing/components/CatalogListPanel.tsx b/frontend/src/billing/components/CatalogListPanel.tsx
index f2af87ea..5f58a34b 100644
--- a/frontend/src/billing/components/CatalogListPanel.tsx
+++ b/frontend/src/billing/components/CatalogListPanel.tsx
@@ -29,7 +29,7 @@ export interface CatalogItem {
 
 export interface CatalogListPanelProps {
   items: CatalogItem[];
-  selectedId: number | null;
+  selectedItem: CatalogItem | null;
   onSelect: (item: CatalogItem) => void;
   onCreatePlan: () => void;
   onCreateAddon: () => void;
@@ -47,7 +47,7 @@ type LegacyFilter = 'all' | 'current' | 'legacy';
 
 export const CatalogListPanel: React.FC<CatalogListPanelProps> = ({
   items,
-  selectedId,
+  selectedItem,
   onSelect,
   onCreatePlan,
   onCreateAddon,
@@ -219,7 +219,7 @@ export const CatalogListPanel: React.FC<CatalogListPanelProps> = ({
               <CatalogListItem
                 key={`${item.type}-${item.id}`}
                 item={item}
-                isSelected={selectedId === item.id}
+                isSelected={selectedItem?.id === item.id && selectedItem?.type === item.type}
                 onSelect={() => onSelect(item)}
                 formatPrice={formatPrice}
               />
diff --git a/frontend/src/pages/platform/BillingManagement.tsx b/frontend/src/pages/platform/BillingManagement.tsx
index 8beead38..45edf891 100644
--- a/frontend/src/pages/platform/BillingManagement.tsx
+++ b/frontend/src/pages/platform/BillingManagement.tsx
@@ -234,7 +234,7 @@ const BillingManagement: React.FC = () => {
               ) : (
                 <CatalogListPanel
                   items={catalogItems}
-                  selectedId={selectedItem?.id || null}
+                  selectedItem={selectedItem}
                   onSelect={setSelectedItem}
                   onCreatePlan={handleCreatePlan}
                   onCreateAddon={handleCreateAddon}