diff --git a/common/pg_properties.cpp b/common/pg_properties.cpp
index 4066f84e7c..785d4d34a8 100644
--- a/common/pg_properties.cpp
+++ b/common/pg_properties.cpp
@@ -20,6 +20,7 @@
 
 #include <pg_properties.h>
 #include <property_mgr.h>
+#include <wx/dc.h>
 #include <wx/propgrid/propgrid.h>
 #include <wx/regex.h>
 
diff --git a/pcbnew/dialogs/pcb_properties_panel.cpp b/pcbnew/dialogs/pcb_properties_panel.cpp
index 447b2b4f7e..415bb7fc53 100644
--- a/pcbnew/dialogs/pcb_properties_panel.cpp
+++ b/pcbnew/dialogs/pcb_properties_panel.cpp
@@ -107,9 +107,15 @@ void PCB_PROPERTIES_PANEL::updateLists( const BOARD* aBoard )
     for( LSEQ layerSeq = aBoard->GetEnabledLayers().UIOrder(); layerSeq; ++layerSeq )
         layersAll.Add( LSET::Name( *layerSeq ), *layerSeq );
 
-    m_propMgr.GetProperty( TYPE_HASH( BOARD_ITEM ), _HKI( "Layer" ) )->SetChoices( layersAll );
-    m_propMgr.GetProperty( TYPE_HASH( PCB_SHAPE ), _HKI( "Layer" ) )->SetChoices( layersAll );
-    m_propMgr.GetProperty( TYPE_HASH( BOARD_CONNECTED_ITEM ), _HKI( "Layer" ) )->SetChoices( layersAll );
+    if( m_propMgr.GetProperty( TYPE_HASH( BOARD_ITEM ), _HKI( "Layer" ) ) )
+        m_propMgr.GetProperty( TYPE_HASH( BOARD_ITEM ), _HKI( "Layer" ) )->SetChoices( layersAll );
+
+    if( m_propMgr.GetProperty( TYPE_HASH( PCB_SHAPE ), _HKI( "Layer" ) ) )
+        m_propMgr.GetProperty( TYPE_HASH( PCB_SHAPE ), _HKI( "Layer" ) )->SetChoices( layersAll );
+
+    if( m_propMgr.GetProperty( TYPE_HASH( BOARD_CONNECTED_ITEM ), _HKI( "Layer" ) ) )
+        m_propMgr.GetProperty( TYPE_HASH( BOARD_CONNECTED_ITEM ), _HKI( "Layer" ) )
+                ->SetChoices( layersAll );
 
     // Regenerate nets
     for( const auto& netinfo : aBoard->GetNetInfo().NetsByNetcode() )
diff --git a/pcbnew/pcb_edit_frame.cpp b/pcbnew/pcb_edit_frame.cpp
index 7845170dec..fb839873e8 100644
--- a/pcbnew/pcb_edit_frame.cpp
+++ b/pcbnew/pcb_edit_frame.cpp
@@ -291,7 +291,7 @@ PCB_EDIT_FRAME::PCB_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
                       .MinSize( 180, -1 ).BestSize( 180, -1 ) );
 
     m_auimgr.AddPane( m_propertiesPanel, EDA_PANE().Name( "PropertiesManager" )
-                      .Left().Layer( 2 )
+                      .Left().Layer( 5 )
                       .Caption( _( "Properties" ) ).PaneBorder( false )
                       .MinSize( 240, -1 ).BestSize( 300, -1 ) );