diff --git a/common/widgets/wx_treebook.cpp b/common/widgets/wx_treebook.cpp
index 4acfd04485..5207da231d 100644
--- a/common/widgets/wx_treebook.cpp
+++ b/common/widgets/wx_treebook.cpp
@@ -58,12 +58,6 @@ public:
         if( show )
             Resolve();
 
-        // m_contents has been created as a child window of LAZY_PAGE, and has been added to
-        // LAZY_PAGE's m_mainSizer.  So wxPanel::Show() should call m_contents' Show() method,
-        // whether overridden or not.  Only it doesn't, so we call it directly here.
-        if( show && m_contents )
-            m_contents->Show( true );
-
         return wxPanel::Show( show );
     }
 
diff --git a/eeschema/dialogs/panel_eeschema_editing_options.cpp b/eeschema/dialogs/panel_eeschema_editing_options.cpp
index 1d3b786b5f..ffd17a8f92 100644
--- a/eeschema/dialogs/panel_eeschema_editing_options.cpp
+++ b/eeschema/dialogs/panel_eeschema_editing_options.cpp
@@ -68,11 +68,9 @@ void PANEL_EESCHEMA_EDITING_OPTIONS::loadEEschemaSettings( EESCHEMA_SETTINGS* aC
     COLOR4D           schematicBackground = settings->GetColor( LAYER_SCHEMATIC_BACKGROUND );
 
     m_borderColorSwatch->SetSwatchBackground( schematicBackground );
-    m_borderColorSwatch->SetDefaultColor( settings->GetDefaultColor( LAYER_SHEET ) );
     m_borderColorSwatch->SetSwatchColor( aCfg->m_Drawing.default_sheet_border_color, false );
 
     m_backgroundColorSwatch->SetSwatchBackground( schematicBackground );
-    m_backgroundColorSwatch->SetDefaultColor( settings->GetDefaultColor( LAYER_SHEET_BACKGROUND ) );
     m_backgroundColorSwatch->SetSwatchColor( aCfg->m_Drawing.default_sheet_background_color, false );
 
     m_choiceLineMode->SetSelection( aCfg->m_Drawing.line_mode );