diff --git a/WebWindowComplex/Compo/CardFrame.razor.cs b/WebWindowComplex/Compo/CardFrame.razor.cs
index 061ba36..be02a74 100644
--- a/WebWindowComplex/Compo/CardFrame.razor.cs
+++ b/WebWindowComplex/Compo/CardFrame.razor.cs
@@ -78,9 +78,9 @@ namespace WebWindowComplex.Compo
             {
                 if (FrameWindow.SelShapeIndex != value)
                 {
+                    FrameWindow.SelShapeIndex = value;
                     // richiesta reset dict shape
                     _ = EC_ReqResetDictShape.InvokeAsync(true);
-                    FrameWindow.SelShapeIndex = value;
                     foreach(var s in SashList)
                     {
                         s.SelHardwareFromId = "000000";
diff --git a/WebWindowComplex/Compo/EditOptionText.razor b/WebWindowComplex/Compo/EditOptionText.razor
index a26b8f6..1822cd9 100644
--- a/WebWindowComplex/Compo/EditOptionText.razor
+++ b/WebWindowComplex/Compo/EditOptionText.razor
@@ -1,9 +1,18 @@
 <div class="input-group mb-2">
     <label class="input-group-text">@(CurrOpt.sName)</label>
-    <select class="form-select" @bind="CurrValue">
-        @foreach (var currValueCombo in CurrOpt.ValueList)
-        {
-            <option value="@currValueCombo">@currValueCombo</option>
-        }
-    </select>
+    @if (CurrOpt.ValueList.Count > 0)
+    {
+        <select class="form-select" @bind="CurrValue">
+            @foreach (var currValueCombo in CurrOpt.ValueList)
+            {
+                <option value="@currValueCombo">@currValueCombo</option>
+            }
+        </select>
+    }
+    else
+    {
+        <select class="form-select" @bind="CurrValue">
+            <option value="@CurrOpt.sValue">@CurrOpt.sValue</option>
+        </select>
+    }
 </div>
\ No newline at end of file
diff --git a/WebWindowComplex/Models/AGBOptionText.cs b/WebWindowComplex/Models/AGBOptionText.cs
index d325dbb..fb6cbc5 100644
--- a/WebWindowComplex/Models/AGBOptionText.cs
+++ b/WebWindowComplex/Models/AGBOptionText.cs
@@ -50,9 +50,16 @@ namespace WebWindowComplex.Models
         public AGBOptionText(ParametriOpzioniParametri HdwOptionParam) : base(HdwOptionParam)
         {
             m_Type = HwOptionTypes.TEXT;
-            foreach (var Value in HdwOptionParam.Opzioni)
-                m_ValueList.Add(Value.Valore);
-            m_sValue = m_ValueList.FirstOrDefault(x => x == HdwOptionParam.ValoreCorrente) ?? "";
+            if(HdwOptionParam.Opzioni != null)
+            {
+                foreach (var Value in HdwOptionParam.Opzioni)
+                    m_ValueList.Add(Value.Valore);
+                m_sValue = m_ValueList.FirstOrDefault(x => x == HdwOptionParam.ValoreCorrente) ?? "";
+            }
+            else
+            {
+                m_sValue = HdwOptionParam.ValoreCorrente;
+            }
         }
 
         #endregion Public Constructors