diff --git a/Icarus/RibPanel/RibPanelVM.vb b/Icarus/RibPanel/RibPanelVM.vb
index 3557357..54fa670 100644
--- a/Icarus/RibPanel/RibPanelVM.vb
+++ b/Icarus/RibPanel/RibPanelVM.vb
@@ -484,6 +484,7 @@ Public Class RibPanelVM
          Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.NULL)
          Map.refRibPanelVM.ResetMachParamIsChecked()
       End If
+      EgtDeselectAll()
       EgtDraw()
       Map.refSceneHostVM.MainScene.SetStatusNull()
    End Sub
diff --git a/Icarus/ShellNumberPanel/ShellNumberPanelVM.vb b/Icarus/ShellNumberPanel/ShellNumberPanelVM.vb
index 7a568f2..c727e82 100644
--- a/Icarus/ShellNumberPanel/ShellNumberPanelVM.vb
+++ b/Icarus/ShellNumberPanel/ShellNumberPanelVM.vb
@@ -484,6 +484,7 @@ Public Class ShellNumberPanelVM
          Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.NULL)
          Map.refShellNumberPanelVM.ResetMachParamIsChecked()
       End If
+      EgtDeselectAll()
       EgtDraw()
       Map.refSceneHostVM.MainScene.SetStatusNull()
    End Sub
diff --git a/Icarus/StartMachPanel/StartMachPanelVM.vb b/Icarus/StartMachPanel/StartMachPanelVM.vb
index 154264c..dded71e 100644
--- a/Icarus/StartMachPanel/StartMachPanelVM.vb
+++ b/Icarus/StartMachPanel/StartMachPanelVM.vb
@@ -370,6 +370,7 @@ Public Class StartMachPanelVM
    Friend Sub Dispose()
       ' ripristino frame originale
       EgtSetGridFrame(m_OriginalGridFrame)
+      EgtDeselectAll()
       EgtDraw()
       Map.refSceneHostVM.MainScene.SetStatusNull()
    End Sub
diff --git a/Icarus/ViewLayerManager/ViewLayerManagerVM.vb b/Icarus/ViewLayerManager/ViewLayerManagerVM.vb
index 416cd4f..16e3386 100644
--- a/Icarus/ViewLayerManager/ViewLayerManagerVM.vb
+++ b/Icarus/ViewLayerManager/ViewLayerManagerVM.vb
@@ -256,7 +256,7 @@ Public Class ViewLayer
           (m_Type = ViewLayerType.START_MACHINING AndAlso Map.refTopPanelVM.SelModifyMode.ModifyMode = ModifyModes.STARTMACH) OrElse
           (m_Type = ViewLayerType.RIBS AndAlso Map.refTopPanelVM.SelModifyMode.ModifyMode = ModifyModes.RIBS) OrElse
           (m_Type = ViewLayerType.SHELL_NUMBER AndAlso Map.refTopPanelVM.SelModifyMode.ModifyMode = ModifyModes.SHELLNUMBER) OrElse
-          (m_Type = ViewLayerType.AUX_SOLIDS AndAlso Map.refTopPanelVM.SelModifyMode.ModifyMode = ModifyModes.AUXSOLIDS)) Then
+          (m_Type = ViewLayerType.AUX_SOLIDS AndAlso Map.refTopPanelVM.SelModifyMode.ModifyMode = ModifyModes.AUXSOLIDS)) AndAlso m_IsVisible = VisibilityType.OFF Then
          m_IsVisible = VisibilityType.FORCED
          UpdateVisibility(True)
       ElseIf m_IsVisible = VisibilityType.FORCED Then