diff --git a/pcbnew/board_commit.cpp b/pcbnew/board_commit.cpp
index 4a8ec0a326..ccfa326e5a 100644
--- a/pcbnew/board_commit.cpp
+++ b/pcbnew/board_commit.cpp
@@ -66,6 +66,7 @@ void BOARD_COMMIT::Push( const wxString& aMessage, bool aCreateUndoEntry, bool a
     PCB_BASE_FRAME* frame = (PCB_BASE_FRAME*) m_toolMgr->GetEditFrame();
     auto connectivity = board->GetConnectivity();
     std::set<EDA_ITEM*> savedModules;
+    std::vector<BOARD_ITEM*> itemsToRemove;
 
     if( Empty() )
         return;
@@ -145,6 +146,8 @@ void BOARD_COMMIT::Push( const wxString& aMessage, bool aCreateUndoEntry, bool a
                     undoList.PushItem( ITEM_PICKER( boardItem, UR_DELETED ) );
                 }
 
+                itemsToRemove.push_back( boardItem );
+
                 switch( boardItem->Type() )
                 {
                 // Module items
@@ -187,9 +190,6 @@ void BOARD_COMMIT::Push( const wxString& aMessage, bool aCreateUndoEntry, bool a
                     {
                         view->Remove( boardItem );
 
-                        // Removing an item should trigger the unselect
-                        m_toolMgr->RunAction( PCB_ACTIONS::unselectItem, true, boardItem );
-
                         if( !( changeFlags & CHT_DONE ) )
                         {
                             MODULE* module = static_cast<MODULE*>( boardItem->GetParent() );
@@ -274,6 +274,12 @@ void BOARD_COMMIT::Push( const wxString& aMessage, bool aCreateUndoEntry, bool a
         }
     }
 
+     // Removing an item should trigger the unselect action
+     // but only after all items are removed otherwise we can get
+     // flickering depending on the system
+     if( itemsToRemove.size() > 0 )
+         m_toolMgr->RunAction( PCB_ACTIONS::unselectItems, true, &itemsToRemove );
+
     if( !m_editModules && aCreateUndoEntry )
         frame->SaveCopyInUndoList( undoList, UR_UNSPECIFIED );
 
diff --git a/pcbnew/tools/selection_tool.cpp b/pcbnew/tools/selection_tool.cpp
index d2beb61f89..df10ce8ba0 100644
--- a/pcbnew/tools/selection_tool.cpp
+++ b/pcbnew/tools/selection_tool.cpp
@@ -1767,12 +1767,12 @@ void SELECTION_TOOL::select( BOARD_ITEM* aItem )
 
 void SELECTION_TOOL::unselect( BOARD_ITEM* aItem )
 {
-    if( !aItem->IsSelected() )
-        return;
-
     m_selection.Remove( aItem );
     unselectVisually( aItem );
 
+    if( m_frame && m_frame->GetCurItem() == aItem )
+        m_frame->SetCurItem( NULL );
+
     if( m_selection.Empty() )
     {
         if( m_frame )