diff --git a/pcbnew/zone_manager/pane_zone_viewer.cpp b/pcbnew/zone_manager/pane_zone_viewer.cpp
index c03402d92b..805a0b076c 100644
--- a/pcbnew/zone_manager/pane_zone_viewer.cpp
+++ b/pcbnew/zone_manager/pane_zone_viewer.cpp
@@ -163,8 +163,6 @@ void PANE_ZONE_VIEWER::ActivateSelectedZone( ZONE* aZone )
         }
     }
 
-    SetSelection( FindPage( m_zoneContainers[firstLayer] ) );
-
     if( !m_zoneGAL )
     {
         m_zoneGAL = ( new PANEL_ZONE_GAL( m_pcbFrame->GetBoard(),
@@ -177,6 +175,7 @@ void PANE_ZONE_VIEWER::ActivateSelectedZone( ZONE* aZone )
         m_zoneContainers[firstLayer]->ResetZoneGAL( m_zoneGAL );
     }
 
+    SetSelection( FindPage( m_zoneContainers[firstLayer] ) );
     m_zoneGAL->ActivateSelectedZone( aZone );
 }