diff --git a/pcbnew/generators/pcb_tuning_pattern.cpp b/pcbnew/generators/pcb_tuning_pattern.cpp
index 8ce4976e29..ccee82ccb4 100644
--- a/pcbnew/generators/pcb_tuning_pattern.cpp
+++ b/pcbnew/generators/pcb_tuning_pattern.cpp
@@ -2094,7 +2094,8 @@ int DRAWING_TOOL::PlaceTuningPattern( const TOOL_EVENT& aEvent )
         setCursor();
         VECTOR2D cursorPos = controls->GetMousePosition();
 
-        if( evt->IsCancelInteractive() || evt->IsActivate() )
+        if( evt->IsCancelInteractive() || evt->IsActivate()
+            || ( m_tuningPattern && evt->IsAction( &ACTIONS::undo ) ) )
         {
             if( m_tuningPattern )
             {