diff --git a/eeschema/tools/lib_edit_tool.cpp b/eeschema/tools/lib_edit_tool.cpp
index 11568b0b1c..cf90b4f19b 100644
--- a/eeschema/tools/lib_edit_tool.cpp
+++ b/eeschema/tools/lib_edit_tool.cpp
@@ -362,6 +362,9 @@ int LIB_EDIT_TOOL::DeleteItemCursor( const TOOL_EVENT& aEvent )
         {
             if( m_pickerItem )
                 m_toolMgr->GetTool<EE_SELECTION_TOOL>()->UnbrightenItem( m_pickerItem );
+
+            // Wake the selection tool after exiting to ensure the cursor gets updated
+            m_toolMgr->RunAction( EE_ACTIONS::selectionActivate, false );
         } );
 
     m_toolMgr->RunAction( ACTIONS::pickerTool, true, &tool );
diff --git a/eeschema/tools/sch_edit_tool.cpp b/eeschema/tools/sch_edit_tool.cpp
index 2b8788628f..00d5d77b3f 100644
--- a/eeschema/tools/sch_edit_tool.cpp
+++ b/eeschema/tools/sch_edit_tool.cpp
@@ -1167,6 +1167,9 @@ int SCH_EDIT_TOOL::DeleteItemCursor( const TOOL_EVENT& aEvent )
         {
             if( m_pickerItem )
                 m_toolMgr->GetTool<EE_SELECTION_TOOL>()->UnbrightenItem( m_pickerItem );
+
+            // Wake the selection tool after exiting to ensure the cursor gets updated
+            m_toolMgr->RunAction( EE_ACTIONS::selectionActivate, false );
         } );
 
     m_toolMgr->RunAction( ACTIONS::pickerTool, true, &tool );
diff --git a/eeschema/tools/sch_editor_control.cpp b/eeschema/tools/sch_editor_control.cpp
index e5fb0a06f1..55aa99e971 100644
--- a/eeschema/tools/sch_editor_control.cpp
+++ b/eeschema/tools/sch_editor_control.cpp
@@ -730,6 +730,9 @@ int SCH_EDITOR_CONTROL::SimProbe( const TOOL_EVENT& aEvent )
                 TOOL_EVENT dummyEvent;
                 UpdateNetHighlighting( dummyEvent );
             }
+
+            // Wake the selection tool after exiting to ensure the cursor gets updated
+            m_toolMgr->RunAction( EE_ACTIONS::selectionActivate, false );
         } );
 
     std::string tool = aEvent.GetCommandStr().get();
@@ -804,6 +807,9 @@ int SCH_EDITOR_CONTROL::SimTune( const TOOL_EVENT& aEvent )
         {
             if( m_pickerItem )
                 m_toolMgr->GetTool<EE_SELECTION_TOOL>()->UnbrightenItem( m_pickerItem );
+
+            // Wake the selection tool after exiting to ensure the cursor gets updated
+            m_toolMgr->RunAction( EE_ACTIONS::selectionActivate, false );
         } );
 
     std::string tool = aEvent.GetCommandStr().get();
diff --git a/pagelayout_editor/tools/pl_edit_tool.cpp b/pagelayout_editor/tools/pl_edit_tool.cpp
index fc26a48127..dd6c575969 100644
--- a/pagelayout_editor/tools/pl_edit_tool.cpp
+++ b/pagelayout_editor/tools/pl_edit_tool.cpp
@@ -405,6 +405,9 @@ int PL_EDIT_TOOL::DeleteItemCursor( const TOOL_EVENT& aEvent )
         {
             if( m_pickerItem )
                 m_toolMgr->GetTool<PL_SELECTION_TOOL>()->UnbrightenItem( m_pickerItem );
+
+            // Wake the selection tool after exiting to ensure the cursor gets updated
+            m_toolMgr->RunAction( PL_ACTIONS::selectionActivate, false );
         } );
 
     m_toolMgr->RunAction( ACTIONS::pickerTool, true, &tool );
diff --git a/pcbnew/tools/pcbnew_control.cpp b/pcbnew/tools/pcbnew_control.cpp
index 95fe1746d8..ea5db0317d 100644
--- a/pcbnew/tools/pcbnew_control.cpp
+++ b/pcbnew/tools/pcbnew_control.cpp
@@ -526,6 +526,9 @@ int PCBNEW_CONTROL::DeleteItemCursor( const TOOL_EVENT& aEvent )
         {
             if( m_pickerItem )
                 m_toolMgr->GetTool<SELECTION_TOOL>()->UnbrightenItem( m_pickerItem );
+
+            // Wake the selection tool after exiting to ensure the cursor gets updated
+            m_toolMgr->RunAction( PCB_ACTIONS::selectionActivate, false );
         } );
 
     m_toolMgr->RunAction( ACTIONS::pickerTool, true, &tool );