diff --git a/gerbview/events_called_functions.cpp b/gerbview/events_called_functions.cpp
index 1ebf029a8f..ebb7fb02fe 100644
--- a/gerbview/events_called_functions.cpp
+++ b/gerbview/events_called_functions.cpp
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2011-2014 Jean-Pierre Charras  jp.charras at wanadoo.fr
- * Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -353,6 +353,9 @@ void GERBVIEW_FRAME::OnSelectActiveDCode( wxCommandEvent& event )
 void GERBVIEW_FRAME::OnSelectActiveLayer( wxCommandEvent& event )
 {
     SetActiveLayer( event.GetSelection(), true );
+
+    // Rebuild the DCode list in toolbar (but not the Layer Box) after change
+    syncLayerBox( false );
 }