diff --git a/pcbnew/class_pcb_layer_widget.cpp b/pcbnew/class_pcb_layer_widget.cpp
index 1e1b89f0b2..013326c2cb 100644
--- a/pcbnew/class_pcb_layer_widget.cpp
+++ b/pcbnew/class_pcb_layer_widget.cpp
@@ -257,7 +257,7 @@ void PCB_LAYER_WIDGET::ReFillRender()
     {
         LAYER_WIDGET::ROW renderRow = s_render_rows[row];
 
-        if( !isAllowedInFpMode( renderRow.id ) )
+        if( m_fp_editor_mode && !isAllowedInFpMode( renderRow.id ) )
             continue;
 
         renderRow.tooltip = wxGetTranslation( s_render_rows[row].tooltip );
@@ -284,7 +284,7 @@ void PCB_LAYER_WIDGET::SyncRenderStates()
     {
         int rowId = s_render_rows[row].id;
 
-        if( !isAllowedInFpMode( rowId ) )
+        if( m_fp_editor_mode && !isAllowedInFpMode( rowId ) )
             continue;
 
         // this does not fire a UI event
diff --git a/pcbnew/dragsegm.cpp b/pcbnew/dragsegm.cpp
index fd1c718d8f..3b8a89f281 100644
--- a/pcbnew/dragsegm.cpp
+++ b/pcbnew/dragsegm.cpp
@@ -320,16 +320,16 @@ void AddSegmentToDragList( int flag, TRACK* aTrack )
     DRAG_SEGM_PICKER wrapper( aTrack );
 
     if( flag & STARTPOINT )
-        wrapper.m_TempFlags |= 1;
-
-    if( flag & ENDPOINT )
-        wrapper.m_TempFlags |= 2;
-
-    if( flag & STARTPOINT )
+    {
+        wrapper.m_TempFlags |= STARTPOINT;
         aTrack->SetFlags( STARTPOINT );
+    }
 
     if( flag & ENDPOINT )
+    {
+        wrapper.m_TempFlags |= ENDPOINT;
         aTrack->SetFlags( ENDPOINT );
+    }
 
     g_DragSegmentList.push_back( wrapper );
 }