diff --git a/common/gr_basic.cpp b/common/gr_basic.cpp
index 522ec0ca97..e36ec126be 100644
--- a/common/gr_basic.cpp
+++ b/common/gr_basic.cpp
@@ -626,7 +626,7 @@ void GRLineArray( EDA_RECT* aClipBox, wxDC* aDC, std::vector<wxPoint>& aLines,
         int y2 = aLines[i+1].y;
         GRLastMoveToX = x2;
         GRLastMoveToY = y2;
-        if( ( aClipBox == NULL ) || clipLine( aClipBox, x1, y1, x2, y2 ) )
+        if( ( aClipBox == NULL ) || !clipLine( aClipBox, x1, y1, x2, y2 ) )
             aDC->DrawLine( x1, y1, x2, y2 );
     }
     if( aClipBox )
diff --git a/pcbnew/move_or_drag_track.cpp b/pcbnew/move_or_drag_track.cpp
index 3d9039f7ed..9a3eceb40a 100644
--- a/pcbnew/move_or_drag_track.cpp
+++ b/pcbnew/move_or_drag_track.cpp
@@ -1014,6 +1014,14 @@ bool PCB_EDIT_FRAME::PlaceDraggedOrMovedTrackSegment( TRACK* Track, wxDC* DC )
     s_ItemsListPicker.ClearItemsList(); // s_ItemsListPicker is no more owner
                                         // of picked items
 
+    if( GetBoard()->IsHightLightNetON() )
+        High_Light( DC );
+
+    GetBoard()->PopHightLight();
+
+    if( GetBoard()->IsHightLightNetON() )
+        GetBoard()->DrawHighLight( DrawPanel, DC, GetBoard()->GetHightLightNetCode() );
+
     OnModify();
     DrawPanel->SetMouseCapture( NULL, NULL );