diff --git a/src/Mod/TechDraw/Gui/QGVPage.cpp b/src/Mod/TechDraw/Gui/QGVPage.cpp
index 7019fd07b8..e45d948961 100644
--- a/src/Mod/TechDraw/Gui/QGVPage.cpp
+++ b/src/Mod/TechDraw/Gui/QGVPage.cpp
@@ -471,11 +471,19 @@ void QGVPage::toggleEdit(bool enable)
             //itemView->updateView(true);
         }
 
+        int textItemType = QGraphicsItem::UserType + 160;
         QGraphicsItem*item = dynamic_cast<QGraphicsItem*>(*it);
         if(item) {
             //item->setCacheMode((enable) ? QGraphicsItem::DeviceCoordinateCache : QGraphicsItem::NoCache);
             item->setCacheMode((enable) ? QGraphicsItem::NoCache : QGraphicsItem::NoCache);
             item->update();
+            if (item->type() == textItemType) {    //TODO: move this into SVGTemplate or TemplateTextField
+                if (enable) {
+                    item->show();
+                } else {
+                    item->hide();
+                }
+            }
         }
     }
     scene()->update();
diff --git a/src/Mod/TechDraw/Gui/TemplateTextField.h b/src/Mod/TechDraw/Gui/TemplateTextField.h
index c893d16c2d..8a18fdc296 100644
--- a/src/Mod/TechDraw/Gui/TemplateTextField.h
+++ b/src/Mod/TechDraw/Gui/TemplateTextField.h
@@ -51,6 +51,10 @@ namespace TechDrawGui
 
             ~TemplateTextField();
 
+            enum {Type = QGraphicsItem::UserType + 160};
+            int type() const { return Type;}
+
+
             /// Returns the field name that this TemplateTextField represents
             std::string fieldName() const { return fieldNameStr; }
         protected:
@@ -61,4 +65,3 @@ namespace TechDrawGui
 }   // namespace TechDrawGui
 
 #endif // #ifndef DRAWINGGUI_TEMPLATETEXTFIELD_H
-