diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/DrawOptionPanelView.xaml b/ProjectPage/OptionPanel/DrawOptionPanel/DrawOptionPanelView.xaml
index 1d2b3e0..5a76aaf 100644
--- a/ProjectPage/OptionPanel/DrawOptionPanel/DrawOptionPanelView.xaml
+++ b/ProjectPage/OptionPanel/DrawOptionPanel/DrawOptionPanelView.xaml
@@ -3,12 +3,6 @@
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Width="200"
    xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity">
 
-   <interactivity:Interaction.Triggers>
-      <interactivity:EventTrigger EventName="Closing">
-         <interactivity:InvokeCommandAction Command="{Binding ClosingCommand}"/>
-      </interactivity:EventTrigger>
-   </interactivity:Interaction.Triggers>
-
    <StackPanel Background="DarkGray">
       <UniformGrid Rows="1">
          <RadioButton Style="{StaticResource DrawOptionPanel_ToggleButton}" Content="DRAW" Height="30" IsChecked="{Binding DrawIsChecked}"/>
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/DrawOptionPanelViewModel.vb b/ProjectPage/OptionPanel/DrawOptionPanel/DrawOptionPanelViewModel.vb
index 8913ba2..d487e9c 100644
--- a/ProjectPage/OptionPanel/DrawOptionPanel/DrawOptionPanelViewModel.vb
+++ b/ProjectPage/OptionPanel/DrawOptionPanel/DrawOptionPanelViewModel.vb
@@ -129,47 +129,11 @@ Namespace EgtCAM5
          End Get
       End Property
 
-      ' Definizione comandi
-      Private m_cmdClosing As ICommand
-
       Sub New()
          ' Inizializzo la selezione della modilità Draw all'apertura del programma
          DrawIsChecked = True
       End Sub
 
-#Region "COMMANDS"
-
-#Region "ClosingCommand"
-
-      ''' <summary>
-      ''' Returns a command that create a new tool.
-      ''' </summary>
-      Public ReadOnly Property ClosingCommand As ICommand
-         Get
-            If m_cmdClosing Is Nothing Then
-               m_cmdClosing = New RelayCommand(AddressOf Closing, AddressOf CanClosing)
-            End If
-            Return m_cmdClosing
-         End Get
-      End Property
-
-      ''' <summary>
-      ''' Creata the new tool.  This method is invoked by the NewCommand.
-      ''' </summary>
-      Public Sub Closing(ByVal param As Object)
-         Application.Msn.NotifyColleagues(Application.DRAWOPTIONPANEL_CLOSING)
-      End Sub
-
-      ''' <summary>
-      ''' Returns true if the selected treeviewitem is valid for new tool creation.
-      ''' </summary>
-      Private Function CanClosing(ByVal param As Object) As Boolean
-         Return True
-      End Function
-
-#End Region ' ClosingCommand
-
-#End Region     ' Commands
    End Class
 
 End Namespace
\ No newline at end of file
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb b/ProjectPage/OptionPanel/DrawOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb
index 298f96e..5c5048e 100644
--- a/ProjectPage/OptionPanel/DrawOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb
+++ b/ProjectPage/OptionPanel/DrawOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb
@@ -264,11 +264,11 @@ Namespace EgtCAM5
 #Region "CONSTRUCTOR"
 
       Sub New()
-         Application.Msn.Register(Application.DRAWOPTIONPANEL_CLOSING, Sub()
-                                                                          If IsExpanded Then
-                                                                             ResetSimulation()
-                                                                          End If
-                                                                       End Sub)
+         Application.Msn.Register(Application.CLOSEAPPLICATION, Sub()
+                                                                   If IsExpanded Then
+                                                                      ResetSimulation()
+                                                                   End If
+                                                                End Sub)
       End Sub
 
 #End Region