diff --git a/pcbnew/dialogs/dialog_global_deletion.cpp b/pcbnew/dialogs/dialog_global_deletion.cpp
index 9cf46aaa26..8d762fe3d8 100644
--- a/pcbnew/dialogs/dialog_global_deletion.cpp
+++ b/pcbnew/dialogs/dialog_global_deletion.cpp
@@ -31,7 +31,9 @@ using namespace std::placeholders;
 #include <board_commit.h>
 #include <board.h>
 #include <footprint.h>
+#include <pcb_generator.h>
 #include <pcb_track.h>
+#include <generators/pcb_tuning_pattern.h>
 #include <tool/tool_manager.h>
 #include <tools/pcb_actions.h>
 #include <tools/global_edit_tool.h>
@@ -272,6 +274,15 @@ void DIALOG_GLOBAL_DELETION::DoGlobalDeletions()
                 }
             }
         }
+
+        for( PCB_GENERATOR* generator : board->Generators() )
+        {
+            if( PCB_TUNING_PATTERN* pattern = dynamic_cast<PCB_TUNING_PATTERN*>( generator ) )
+            {
+                if( pattern->GetBoardItems().empty() )
+                    commit.Remove( pattern );
+            }
+        }
     }
 
     commit.Push( _( "Global Delete" ) );
diff --git a/pcbnew/generators/pcb_tuning_pattern.h b/pcbnew/generators/pcb_tuning_pattern.h
index 506b8260db..18858b370d 100644
--- a/pcbnew/generators/pcb_tuning_pattern.h
+++ b/pcbnew/generators/pcb_tuning_pattern.h
@@ -23,6 +23,7 @@
  */
 
 #include <eda_item.h>
+#include <geometry/geometry_utils.h>
 #include <pcb_base_edit_frame.h>
 #include <router/pns_meander.h>
 #include <router/pns_meander_placer_base.h>