diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index a0c9541..d409fc4 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -72,5 +72,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.4.9.1")>
-<Assembly: AssemblyFileVersion("2.4.9.1")>
+<Assembly: AssemblyVersion("2.4.11.1")>
+<Assembly: AssemblyFileVersion("2.4.11.1")>
diff --git a/OptionsWindow/OptionModule.vb b/OptionsWindow/OptionModule.vb
index eda57d7..1b55165 100644
--- a/OptionsWindow/OptionModule.vb
+++ b/OptionsWindow/OptionModule.vb
@@ -824,12 +824,17 @@ Friend Module OptionModule
    Friend Sub CreateNewPropertiesList(ByRef LocalPart As Part)
       If OptionModule.m_DisableProperties <> Visibility.Visible Then Return
       If OptionModule.m_MaterialList.Count > 0 Then
-         LocalPart.SetMaterial(OptionModule.m_MaterialList(0))
+         ' assegno la proprietà di materiale 
+         If Not IsNothing(LocalPart.SelectedMaterial) Then
+            LocalPart.SetMaterial(LocalPart.SelectedMaterial)
+         Else
+            LocalPart.SetMaterial(OptionModule.m_MaterialList(0))
+         End If
          LocalPart.SetPropertiesList(OptionModule.m_MaterialList(0).PropertiesList)
          Return
       End If
-      ' configurazione senza materiali
-      If LocalPart.PropertiesList.Count > 0 Then LocalPart.PropertiesList.Clear()
+         ' configurazione senza materiali
+         If LocalPart.PropertiesList.Count > 0 Then LocalPart.PropertiesList.Clear()
       For Each Item In OptionModule.m_PropertList
          LocalPart.PropertiesList.Add(New PropertyItem(Item.Name, Item.GraphicName, Item.IsChecked))
       Next