diff --git a/pcbnew/menubar_pcb_editor.cpp b/pcbnew/menubar_pcb_editor.cpp
index ea0a535e7a..d472ac056c 100644
--- a/pcbnew/menubar_pcb_editor.cpp
+++ b/pcbnew/menubar_pcb_editor.cpp
@@ -402,12 +402,16 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
     toolsMenu->Add( ACTIONS::showFootprintEditor );
     toolsMenu->Add( PCB_ACTIONS::updateFootprints );
 
-
-    toolsMenu->AppendSeparator();
-    toolsMenu->Add( _( "Add Teardrops" ), "",
-                    ID_RUN_TEARDROP_TOOL, BITMAPS::via );
-    toolsMenu->Add( _( "Remove Teardrops" ), "",
-                    ID_REMOVE_TEARDROP_TOOL, BITMAPS::via );
+    // Currently: available only with advanced_config m_AllowTeardrops = true
+    // (AllowTeardrops = 1)
+    if(  ADVANCED_CFG::GetCfg().m_AllowTeardrops )
+    {
+        toolsMenu->AppendSeparator();
+        toolsMenu->Add( _( "Add Teardrops" ), "",
+                        ID_RUN_TEARDROP_TOOL, BITMAPS::via );
+        toolsMenu->Add( _( "Remove Teardrops" ), "",
+                        ID_REMOVE_TEARDROP_TOOL, BITMAPS::via );
+    }
 
     toolsMenu->AppendSeparator();
     toolsMenu->Add( PCB_ACTIONS::cleanupTracksAndVias );