diff --git a/src/Mod/TechDraw/App/DrawHatch.cpp b/src/Mod/TechDraw/App/DrawHatch.cpp
index 0bc4ead8c..4fb725291 100644
--- a/src/Mod/TechDraw/App/DrawHatch.cpp
+++ b/src/Mod/TechDraw/App/DrawHatch.cpp
@@ -45,7 +45,7 @@
 using namespace TechDraw;
 using namespace std;
 
-PROPERTY_SOURCE(TechDraw::DrawHatch, TechDraw::DrawView)
+PROPERTY_SOURCE(TechDraw::DrawHatch, App::DocumentObject)
 
 
 DrawHatch::DrawHatch(void)
@@ -83,10 +83,6 @@ void DrawHatch::onChanged(const App::Property* prop)
         prop == &HatchColor) {
         if (!isRestoring()) {
               DrawHatch::execute();
-              if (getSourceView()) {
-                  getSourceView()->touch();
-                  getSourceView()->recompute();
-              }
           }
     }
     App::DocumentObject::onChanged(prop);
@@ -98,6 +94,7 @@ App::DocumentObjectExecReturn *DrawHatch::execute(void)
     DrawViewPart* parent = getSourceView();
     if (parent) {
         parent->touch();
+        parent->recompute();
     }
     return App::DocumentObject::StdReturn;
 }
diff --git a/src/Mod/TechDraw/App/DrawHatch.h b/src/Mod/TechDraw/App/DrawHatch.h
index 721875f75..67363a072 100644
--- a/src/Mod/TechDraw/App/DrawHatch.h
+++ b/src/Mod/TechDraw/App/DrawHatch.h
@@ -34,7 +34,7 @@
 namespace TechDraw
 {
 
-class TechDrawExport DrawHatch : public TechDraw::DrawView
+class TechDrawExport DrawHatch : public App::DocumentObject
 {
     PROPERTY_HEADER(TechDraw::DrawHatch);
 
diff --git a/src/Mod/TechDraw/App/DrawHatchPy.xml b/src/Mod/TechDraw/App/DrawHatchPy.xml
index bce289344..46df05806 100644
--- a/src/Mod/TechDraw/App/DrawHatchPy.xml
+++ b/src/Mod/TechDraw/App/DrawHatchPy.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <GenerateModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="generateMetaModel_Module.xsd">
   <PythonExport
-    Father="DrawViewPy"
+    Father="DocumentObjectPy"
     Name="DrawHatchPy"
     Twin="DrawHatch"
     TwinPointer="DrawHatch"
     Include="Mod/TechDraw/App/DrawHatch.h"
     Namespace="TechDraw"
-    FatherInclude="Mod/TechDraw/App/DrawViewPy.h"
-    FatherNamespace="TechDraw">
+    FatherInclude="App/DocumentObjectPy.h"
+    FatherNamespace="App">
     <Documentation>
       <Author Licence="LGPL" Name="WandererFan" EMail="wandererfan@gmail.com" />
       <UserDocu>Feature for creating and manipulating Technical Drawing Hatch areas</UserDocu>
diff --git a/src/Mod/TechDraw/Gui/CommandDecorate.cpp b/src/Mod/TechDraw/Gui/CommandDecorate.cpp
index 99083aba6..f80ad25ed 100644
--- a/src/Mod/TechDraw/Gui/CommandDecorate.cpp
+++ b/src/Mod/TechDraw/Gui/CommandDecorate.cpp
@@ -136,9 +136,12 @@ void CmdTechDrawNewHatch::activated(int iMsg)
 
     TechDraw::DrawHatch *hatch = 0;
     std::string FeatName = getUniqueObjectName("Hatch");
+    std::stringstream featLabel;
+    featLabel << FeatName << "F" << TechDraw::DrawUtil::getIndexFromName(subNames.at(0));
 
     openCommand("Create Hatch");
     doCommand(Doc,"App.activeDocument().addObject('TechDraw::DrawHatch','%s')",FeatName.c_str());
+    doCommand(Doc,"App.activeDocument().%s.Label = '%s'",FeatName.c_str(),featLabel.str().c_str());
 
     hatch = dynamic_cast<TechDraw::DrawHatch *>(getDocument()->getObject(FeatName.c_str()));
     hatch->Source.setValue(objFeat, subNames);
diff --git a/src/Mod/TechDraw/Gui/QGIFace.cpp b/src/Mod/TechDraw/Gui/QGIFace.cpp
index 35b9526be..f0f1da38d 100644
--- a/src/Mod/TechDraw/Gui/QGIFace.cpp
+++ b/src/Mod/TechDraw/Gui/QGIFace.cpp
@@ -184,7 +184,7 @@ QPainterPath QGIFace::shape() const
 
 void QGIFace::paint ( QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget) {
     QStyleOptionGraphicsItem myOption(*option);
-    //myOption.state &= ~QStyle::State_Selected;
+    myOption.state &= ~QStyle::State_Selected;
 
     m_pen.setColor(m_colCurrent);
     setPen(m_pen);