diff --git a/pcbnew/pcb_draw_panel_gal.cpp b/pcbnew/pcb_draw_panel_gal.cpp
index f8ef38862a..0f517adf02 100644
--- a/pcbnew/pcb_draw_panel_gal.cpp
+++ b/pcbnew/pcb_draw_panel_gal.cpp
@@ -353,14 +353,12 @@ void PCB_DRAW_PANEL_GAL::SetTopLayer( PCB_LAYER_ID aLayer )
                 m_view->SetTopLayer( ZONE_LAYER_FOR( layer ) );
         }
 
-        // Move the active layer to the top.  Dwgs_User and Cmts_User are simply the first two
-        // "real" layers in the layer ordering, so they are used as "on top" -- overlay layers
-        // should still be above them.
+        // Move the active layer to the top of the stack but below all the overlay layers
         if( !IsCopperLayer( aLayer ) )
         {
-            m_view->SetLayerOrder( aLayer, m_view->GetLayerOrder( Dwgs_User ) );
+            m_view->SetLayerOrder( aLayer, m_view->GetLayerOrder( LAYER_MARKER_SHADOWS ) + 1 );
             m_view->SetLayerOrder( ZONE_LAYER_FOR( aLayer ),
-                                   m_view->GetLayerOrder( Cmts_User ) );
+                                   m_view->GetLayerOrder( LAYER_MARKER_SHADOWS ) + 2 );
         }
     }
     else if( IsCopperLayer( aLayer ) )