diff --git a/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp b/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp
index 021592aa86..2f450a2796 100644
--- a/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp
+++ b/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp
@@ -123,6 +123,7 @@ TaskLeaderLine::TaskLeaderLine(TechDrawGui::ViewProviderLeader* leadVP) :
     saveState();
 
     m_trackerMode = QGTracker::TrackerMode::Line;
+    m_saveContextPolicy = m_mdi->contextMenuPolicy();
 }
 
 //ctor for creation
@@ -165,6 +166,8 @@ TaskLeaderLine::TaskLeaderLine(TechDraw::DrawView* baseFeat,
     ui->pbCancelEdit->setEnabled(false);
 
     m_trackerMode = QGTracker::TrackerMode::Line;
+    m_saveContextPolicy = m_mdi->contextMenuPolicy();
+
 }
 
 TaskLeaderLine::~TaskLeaderLine()
@@ -648,12 +651,12 @@ bool TaskLeaderLine::accept()
 //        removeTracker();
         createLeaderFeature(m_trackerPoints);
     }
-    m_mdi->setContextMenuPolicy(m_saveContextPolicy);
     m_trackerMode = QGTracker::TrackerMode::None;
     removeTracker();
 
     Gui::Command::doCommand(Gui::Command::Gui,"Gui.ActiveDocument.resetEdit()");
 
+    m_mdi->setContextMenuPolicy(m_saveContextPolicy);
     return true;
 }
 
@@ -670,9 +673,6 @@ bool TaskLeaderLine::reject()
     Gui::Document* doc = Gui::Application::Instance->getDocument(m_basePage->getDocument());
     if (!doc) return false;
 
-    if (m_mdi != nullptr) {
-        m_mdi->setContextMenuPolicy(m_saveContextPolicy);
-    }
     if (getCreateMode() &&
         (m_lineFeat != nullptr) )  {
         removeFeature();
@@ -690,6 +690,10 @@ bool TaskLeaderLine::reject()
     Gui::Command::doCommand(Gui::Command::Gui,"App.activeDocument().recompute()");
     Gui::Command::doCommand(Gui::Command::Gui,"Gui.ActiveDocument.resetEdit()");
 
+    if (m_mdi != nullptr) {
+        m_mdi->setContextMenuPolicy(m_saveContextPolicy);
+    }
+
     return false;
 }
 
diff --git a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp
index 7ac76ce6af..6bd525f305 100644
--- a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp
+++ b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp
@@ -553,7 +553,7 @@ std::vector<App::DocumentObject*> TaskWeldingSymbol::createTiles(void)
 
 std::vector<App::DocumentObject*> TaskWeldingSymbol::updateTiles(void)
 {
-    Base::Console().Message("TWS::updateTiles()\n");
+//    Base::Console().Message("TWS::updateTiles()\n");
     std::vector<App::DocumentObject*> tileFeats;
     std::string tileType("TechDraw::DrawTileWeld");
     std::string tileName;