diff --git a/Icarus/ManagePartPanel/ManagePartPanelV.xaml b/Icarus/ManagePartPanel/ManagePartPanelV.xaml
index fb93b42..e2a3bac 100644
--- a/Icarus/ManagePartPanel/ManagePartPanelV.xaml
+++ b/Icarus/ManagePartPanel/ManagePartPanelV.xaml
@@ -49,8 +49,13 @@
                                    Style="{StaticResource BaseTextBlock}"/>
                         <EgtWPFLib5:EgtTextBox Text="{Binding sName, UpdateSourceTrigger=Explicit}"
                                                IsExplicitFocused="{Binding UserShouldEditValueNow}"
-                                               Visibility="{Binding TextBox_Visibility}"
-                                               Style="{StaticResource OptionTextBox}"/>
+                                               Visibility="{Binding TextBox_Visibility}">
+                           <EgtWPFLib5:EgtTextBox.Style>
+                              <Style TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource OptionTextBox}">
+                                 <EventSetter Event="PreviewKeyDown" Handler="TextBox_PreviewKeyDown"/>
+                              </Style>
+                           </EgtWPFLib5:EgtTextBox.Style>
+                        </EgtWPFLib5:EgtTextBox>
                      </Grid>
                   </StackPanel>
                </HierarchicalDataTemplate>
@@ -69,8 +74,13 @@
                                 Style="{StaticResource BaseTextBlock}"/>
                      <EgtWPFLib5:EgtTextBox Text="{Binding sName, UpdateSourceTrigger=Explicit}"
                                             IsExplicitFocused="{Binding UserShouldEditValueNow}"
-                                            Visibility="{Binding TextBox_Visibility}"
-                                            Style="{StaticResource OptionTextBox}"/>
+                                            Visibility="{Binding TextBox_Visibility}">
+                        <EgtWPFLib5:EgtTextBox.Style>
+                           <Style TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource OptionTextBox}">
+                              <EventSetter Event="PreviewKeyDown" Handler="TextBox_PreviewKeyDown"/>
+                           </Style>
+                        </EgtWPFLib5:EgtTextBox.Style>
+                     </EgtWPFLib5:EgtTextBox>
                   </Grid>
                </HierarchicalDataTemplate>
                <!-- Menu' tasto destro -->
diff --git a/Icarus/ManagePartPanel/ManagePartPanelV.xaml.vb b/Icarus/ManagePartPanel/ManagePartPanelV.xaml.vb
index ff9c652..814dd7a 100644
--- a/Icarus/ManagePartPanel/ManagePartPanelV.xaml.vb
+++ b/Icarus/ManagePartPanel/ManagePartPanelV.xaml.vb
@@ -23,4 +23,12 @@
       End Select
    End Sub
 
+   Private Sub TextBox_PreviewKeyDown(sender As Object, e As KeyEventArgs)
+      ' per evitare che il click del tasto Enter a fine edit faccia scattare anche la chiusura
+      ' di tutto il pannello a causa del IsDefault sul tasto di chiusura, termino la gestione del click
+      If e.Key = Key.Enter Then
+         e.Handled = True
+      End If
+   End Sub
+
 End Class