diff --git a/src/app/cartography/shared/widgets/nodes.widget.ts b/src/app/cartography/shared/widgets/nodes.widget.ts
index 9cd0589d..21499e34 100644
--- a/src/app/cartography/shared/widgets/nodes.widget.ts
+++ b/src/app/cartography/shared/widgets/nodes.widget.ts
@@ -67,7 +67,7 @@ export class NodesWidget implements Widget {
           if (n.label.x === null) {
             // center
             const bbox = this.getBBox();
-            return - n.height + 20;
+            return - n.height / 2. - bbox.height ;
           }
           return n.label.y - n.height / 2.;
         });
diff --git a/src/app/project-map/project-map.component.ts b/src/app/project-map/project-map.component.ts
index 01638ad6..3ddb5ddd 100644
--- a/src/app/project-map/project-map.component.ts
+++ b/src/app/project-map/project-map.component.ts
@@ -267,6 +267,7 @@ export class ProjectMapComponent implements OnInit {
 
   public turnOffDrawLineMode() {
     this.drawLineMode = false;
+    this.mapChild.graphLayout.getDrawingLineTool().stop();
   }
 
   public onChooseInterface(event) {