diff --git a/include/layers_id_colors_and_visibility.h b/include/layers_id_colors_and_visibility.h
index bb1b13a243..3ab011d3b5 100644
--- a/include/layers_id_colors_and_visibility.h
+++ b/include/layers_id_colors_and_visibility.h
@@ -240,6 +240,7 @@ enum PCB_VISIBLE
     PAD_BK_NETNAMES_VISIBLE,
     PADS_NETNAMES_VISIBLE,
 
+    SELECTION,
     GP_OVERLAY,                 // General purpose overlay
 
     END_PCB_VISIBLE_LIST  // sentinel
@@ -258,7 +259,7 @@ enum PCB_VISIBLE
 /// means that layer is displayed closer to the user, ie. on the top).
 const LAYER_NUM GalLayerOrder[] =
 {
-    ITEM_GAL_LAYER( GP_OVERLAY ),
+    ITEM_GAL_LAYER( GP_OVERLAY ), ITEM_GAL_LAYER( SELECTION ),
     ITEM_GAL_LAYER( PADS_NETNAMES_VISIBLE ),
     DRAW_N, COMMENT_N, ECO1_N, ECO2_N, EDGE_N,
     UNUSED_LAYER_29, UNUSED_LAYER_30, UNUSED_LAYER_31,
diff --git a/pcbnew/basepcbframe.cpp b/pcbnew/basepcbframe.cpp
index 1308addc82..1c4c6a65e1 100644
--- a/pcbnew/basepcbframe.cpp
+++ b/pcbnew/basepcbframe.cpp
@@ -831,6 +831,7 @@ void PCB_BASE_FRAME::LoadSettings()
     view->SetRequired( ITEM_GAL_LAYER( PADS_NETNAMES_VISIBLE ), ITEM_GAL_LAYER( PADS_VISIBLE ) );
     view->SetRequired( ITEM_GAL_LAYER( PAD_FR_NETNAMES_VISIBLE ), ITEM_GAL_LAYER( PAD_FR_VISIBLE ) );
     view->SetRequired( ITEM_GAL_LAYER( PAD_BK_NETNAMES_VISIBLE ), ITEM_GAL_LAYER( PAD_BK_VISIBLE ) );
+    view->SetLayerTarget( ITEM_GAL_LAYER( SELECTION ), KiGfx::TARGET_OVERLAY );
     view->SetLayerTarget( ITEM_GAL_LAYER( GP_OVERLAY ), KiGfx::TARGET_OVERLAY );
 
     // Apply layer coloring scheme & display options
diff --git a/pcbnew/class_dimension.cpp b/pcbnew/class_dimension.cpp
index 6cd8c58bec..c6dab49476 100644
--- a/pcbnew/class_dimension.cpp
+++ b/pcbnew/class_dimension.cpp
@@ -495,7 +495,7 @@ void DIMENSION::ViewGetLayers( int aLayers[], int& aCount ) const
     aLayers[0] = m_Layer;
 
     // On the general purpose overlay there is a selection box displayed
-    aLayers[1] = ITEM_GAL_LAYER( GP_OVERLAY );
+    aLayers[1] = ITEM_GAL_LAYER( SELECTION );
 
     aCount = 2;
 }
diff --git a/pcbnew/class_module.cpp b/pcbnew/class_module.cpp
index cf61f31493..0b68f61e64 100644
--- a/pcbnew/class_module.cpp
+++ b/pcbnew/class_module.cpp
@@ -1028,5 +1028,5 @@ void MODULE::SetOrientation( double newangle )
 void MODULE::ViewGetLayers( int aLayers[], int& aCount ) const
 {
     aCount = 1;
-    aLayers[0] = ITEM_GAL_LAYER( GP_OVERLAY );     // Selection box
+    aLayers[0] = ITEM_GAL_LAYER( SELECTION );     // Selection box
 }
diff --git a/pcbnew/class_pcb_text.cpp b/pcbnew/class_pcb_text.cpp
index 2ce86606aa..15920fa968 100644
--- a/pcbnew/class_pcb_text.cpp
+++ b/pcbnew/class_pcb_text.cpp
@@ -231,7 +231,7 @@ void TEXTE_PCB::ViewGetLayers( int aLayers[], int& aCount ) const
     aLayers[0] = m_Layer;
 
     // On the general purpose overlay there is a selection box displayed
-    aLayers[1] = ITEM_GAL_LAYER( GP_OVERLAY );
+    aLayers[1] = ITEM_GAL_LAYER( SELECTION );
 
     aCount = 2;
 }
diff --git a/pcbnew/class_text_mod.cpp b/pcbnew/class_text_mod.cpp
index 37b9a63c3c..e4f28f31b1 100644
--- a/pcbnew/class_text_mod.cpp
+++ b/pcbnew/class_text_mod.cpp
@@ -473,7 +473,7 @@ void TEXTE_MODULE::ViewGetLayers( int aLayers[], int& aCount ) const
     }
 
     // On the general purpose overlay there is a selection box displayed
-    aLayers[1] = ITEM_GAL_LAYER( GP_OVERLAY );
+    aLayers[1] = ITEM_GAL_LAYER( SELECTION );
 
     aCount = 2;
 }
diff --git a/pcbnew/pcb_painter.cpp b/pcbnew/pcb_painter.cpp
index 59da4f9770..45841207ed 100644
--- a/pcbnew/pcb_painter.cpp
+++ b/pcbnew/pcb_painter.cpp
@@ -698,7 +698,7 @@ void PCB_PAINTER::draw( const MODULE* aModule )
 
 void PCB_PAINTER::draw( const TEXTE_PCB* aText, int aLayer )
 {
-    if( aLayer == ITEM_GAL_LAYER( GP_OVERLAY ) )
+    if( aLayer == ITEM_GAL_LAYER( SELECTION ) )
     {
         if( aText->IsSelected() )
             drawSelectionBox( aText );
@@ -722,7 +722,7 @@ void PCB_PAINTER::draw( const TEXTE_PCB* aText, int aLayer )
 
 void PCB_PAINTER::draw( const TEXTE_MODULE* aText, int aLayer )
 {
-    if( aLayer == ITEM_GAL_LAYER( GP_OVERLAY ) )
+    if( aLayer == ITEM_GAL_LAYER( SELECTION ) )
     {
         if( aText->IsSelected() )
             drawSelectionBox( aText );
@@ -816,7 +816,7 @@ void PCB_PAINTER::draw( const ZONE_CONTAINER* aZone )
 
 void PCB_PAINTER::draw( const DIMENSION* aDimension, int aLayer )
 {
-    if( aLayer == ITEM_GAL_LAYER( GP_OVERLAY ) )
+    if( aLayer == ITEM_GAL_LAYER( SELECTION ) )
     {
         if( aDimension->IsSelected() )
             drawSelectionBox( aDimension );