diff --git a/gerbview/initpcb.cpp b/gerbview/initpcb.cpp
index 91ea0e3f0e..68fa949d5c 100644
--- a/gerbview/initpcb.cpp
+++ b/gerbview/initpcb.cpp
@@ -191,8 +191,6 @@ void WinEDA_GerberFrame::Erase_Textes_Pcb( wxDC* DC, bool query )
 void WinEDA_GerberFrame::Erase_Current_Layer( wxDC* DC, bool query )
 /*******************************************************************/
 {
-    TRACK*          pt_segm;
-    BOARD_ITEM*     PtNext;
     int             layer = GetScreen()->m_Active_Layer;
     wxString        msg;
 
@@ -200,8 +198,9 @@ void WinEDA_GerberFrame::Erase_Current_Layer( wxDC* DC, bool query )
     if( query && !IsOK( this, msg ) )
         return;
 
-    /* Marquage des pistes a effacer */
-    for( pt_segm = m_Pcb->m_Track; pt_segm != NULL; pt_segm = (TRACK*) PtNext )
+    /* Delete tracks (spots and lines) */
+    TRACK*     PtNext;
+    for( TRACK* pt_segm = m_Pcb->m_Track; pt_segm != NULL; pt_segm = (TRACK*) PtNext )
     {
         PtNext = pt_segm->Next();
         if( pt_segm->GetLayer() != layer )
@@ -209,6 +208,15 @@ void WinEDA_GerberFrame::Erase_Current_Layer( wxDC* DC, bool query )
         pt_segm->DeleteStructure();
     }
 
+    /* Delete polygons */
+    SEGZONE*     Nextzone;
+    for( SEGZONE* zone = m_Pcb->m_Zone; zone != NULL; zone = Nextzone )
+    {
+        Nextzone = zone->Next();
+        if( zone->GetLayer() != layer )
+            continue;
+        zone->DeleteStructure();
+    }
     ScreenPcb->SetModify();
     ScreenPcb->SetRefreshReq();
 }
diff --git a/gerbview/options.cpp b/gerbview/options.cpp
index e73b4fdb06..c93dfd285f 100644
--- a/gerbview/options.cpp
+++ b/gerbview/options.cpp
@@ -88,8 +88,8 @@ int id = event.GetId();
 
 		case ID_TB_OPTIONS_SHOW_POLYGONS_SKETCH:
 			if ( m_OptionsToolBar->GetToolState(id) )	// Polygons filled asked
-				 g_DisplayPolygonsModeSketch = 0;
-			else g_DisplayPolygonsModeSketch = 1;
+				 g_DisplayPolygonsModeSketch = 1;
+			else g_DisplayPolygonsModeSketch = 0;
 			DrawPanel->Refresh(TRUE);
 			break;