diff --git a/NestPageUC.xaml.vb b/NestPageUC.xaml.vb
index 8ea4759..3fc2628 100644
--- a/NestPageUC.xaml.vb
+++ b/NestPageUC.xaml.vb
@@ -609,6 +609,8 @@ Public Class NestPageUC
    End Function
 
    Private Sub RemovePartBtn_Click(sender As Object, e As RoutedEventArgs) Handles RemovePartBtn.Click
+      ' Se non ci sono pezzi selezionati, esco subito
+      If EgtGetFirstSelectedObj() = GDB_ID.NULL Then Return
       ' Chiedo conferma prima di procedere
       Dim RemovePartWnd As EgtMsgBox = New EgtMsgBox(m_MainWindow, "", EgtMsg(MSG_EGTMSGBOX + 21), EgtMsgBox.Buttons.OK_CANCEL, EgtMsgBox.Icons.NULL)
       If RemovePartWnd.m_nPressedBtn = 0 Then
diff --git a/ProjectMgrUC.xaml.vb b/ProjectMgrUC.xaml.vb
index 5abfd67..fe37957 100644
--- a/ProjectMgrUC.xaml.vb
+++ b/ProjectMgrUC.xaml.vb
@@ -40,6 +40,7 @@ Public Class ProjectMgrUC
          m_VeinMatchingWnd.Hide()
          VeinMatching.m_nVeinCtx = GetVeinMatchingContext()
          EgtSetCurrentContext(m_CurrProjPage.CurrentProjectScene.GetCtx())
+         m_VeinMatchingWnd.AdjustPosition()
       End If
    End Sub
 
@@ -382,7 +383,6 @@ Public Class ProjectMgrUC
       ' Se non già creata, non devo fare alcunchè
       If IsNothing(m_VeinMatchingWnd) Then Return
       ' Esecuzione
-      m_VeinMatchingWnd.AdjustPosition()
       m_VeinMatchingWnd.Show()
       EgtSetCurrentContext(m_CurrProjPage.CurrentProjectScene.GetCtx())
       VeinMatchingBtn.IsChecked = True