diff --git a/MP.SPEC/Components/ListPODL.razor b/MP.SPEC/Components/ListPODL.razor
index b7bf7cb8..b88df56a 100644
--- a/MP.SPEC/Components/ListPODL.razor
+++ b/MP.SPEC/Components/ListPODL.razor
@@ -32,7 +32,7 @@ else
                 <tbody>
                     @foreach (var record in ListRecords)
                     {
-                        <tr class="@checkSelect(@record.CodArticolo)">
+                        <tr class="@checkSelect(@record)">
                             <td>
                                 <button @onclick="() => selRecord(record)" class="btn btn-primary btn-sm" title="Modifica Record"><i class="bi bi-pencil-square"></i></button>
                                 <button @onclick="() => cloneRecord(record)" class="btn btn-info btn-sm" title="Duplica Record"><i class="bi bi-clipboard-check"></i></button>
diff --git a/MP.SPEC/Components/ListPODL.razor.cs b/MP.SPEC/Components/ListPODL.razor.cs
index 08e811b7..8b69b7a0 100644
--- a/MP.SPEC/Components/ListPODL.razor.cs
+++ b/MP.SPEC/Components/ListPODL.razor.cs
@@ -22,14 +22,14 @@ namespace MP.SPEC.Components
 
         #region Public Methods
 
-        public string checkSelect(string CodArticolo)
+        public string checkSelect(PODLModel record)
         {
             string answ = "";
             if (currRecord != null)
             {
                 try
                 {
-                    answ = (currRecord.CodArticolo == CodArticolo) ? "table-info" : "";
+                    answ = ((currRecord.IdxMacchina == record.IdxMacchina) && (currRecord.CodArticolo == record.CodArticolo) && (currRecord.CodFase == record.CodFase)) ? "table-info" : "";
                 }
                 catch
                 { }
@@ -76,6 +76,7 @@ namespace MP.SPEC.Components
                 PzPallet = selRec.PzPallet,
                 Tcassegnato = selRec.Tcassegnato
             };
+            currRecord = selRec;
             await RecordSel.InvokeAsync(newRec);
         }
 
@@ -126,11 +127,13 @@ namespace MP.SPEC.Components
 
         protected async Task resetSel()
         {
+            currRecord = null;
             await RecordSel.InvokeAsync(null);
         }
 
         protected async Task selRecord(PODLModel selRec)
         {
+            currRecord = selRec;
             await RecordSel.InvokeAsync(selRec);
         }
 
diff --git a/MP.SPEC/Pages/PODL.razor b/MP.SPEC/Pages/PODL.razor
index 9ce35a87..a890faa2 100644
--- a/MP.SPEC/Pages/PODL.razor
+++ b/MP.SPEC/Pages/PODL.razor
@@ -143,10 +143,15 @@
                             </div>
                             <div class="row mt-2">
                                 <div class="col-3">
-                                    <span class="input-group-text" id="inputGroup-sizing-sm" title="Attivabile">Att</span>
-
-                                    <div class="form-check form-check-sm form-switch py-1" title="Attivabile">
-                                        <input class="form-check-input" type="checkbox" id="mySwitch" name="setupAlarms" title="Attivabile" @bind="@currRecord.Attivabile">
+                                    <div class="input-group input-group-sm d-flex justify-content-between">
+                                        <div class="input-group-text" id="inputGroup-sizing-sm">
+                                            <div class="pe-3" title="Attivabile">
+                                                Attivabile
+                                            </div>
+                                            <div class="form-check form-check-sm form-switch py-1"  title="Attivabile">
+                                                <input class="form-check-input" type="checkbox" id="mySwitch" name="setupAlarms" title="Attivabile" @bind="@currRecord.Attivabile">
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
                                 <div class="col-3">