diff --git a/eeschema/dialogs/panel_eeschema_color_settings.cpp b/eeschema/dialogs/panel_eeschema_color_settings.cpp
index 7ef0b3a6bf..c5b1b2d25a 100644
--- a/eeschema/dialogs/panel_eeschema_color_settings.cpp
+++ b/eeschema/dialogs/panel_eeschema_color_settings.cpp
@@ -414,7 +414,10 @@ void PANEL_EESCHEMA_COLOR_SETTINGS::createPreviewItems()
         SCH_ITEM* sch_item = dynamic_cast<SCH_ITEM*>( item );
 
         if( sch_item && sch_item->IsConnectable() )
+        {
+            sch_item->AutoplaceFields( nullptr, false );
             sch_item->GetEndPoints( endPoints );
+        }
     }
 
     for( EDA_ITEM* item : m_previewItems )
diff --git a/eeschema/sch_preview_panel.cpp b/eeschema/sch_preview_panel.cpp
index a7a9b0e469..d9f21903f0 100644
--- a/eeschema/sch_preview_panel.cpp
+++ b/eeschema/sch_preview_panel.cpp
@@ -57,7 +57,9 @@ SCH_PREVIEW_PANEL::SCH_PREVIEW_PANEL( wxWindow* aParentWindow, wxWindowID aWindo
     auto* renderSettings = static_cast<KIGFX::SCH_RENDER_SETTINGS*>( m_painter->GetSettings() );
     renderSettings->LoadColors( Pgm().GetSettingsManager().GetColorSettings() );
     renderSettings->m_ShowPinsElectricalType = false;
-    renderSettings->m_TextOffsetRatio = 0.30;
+    renderSettings->m_ShowHiddenText = false;
+    renderSettings->m_ShowHiddenPins = false;
+    renderSettings->m_TextOffsetRatio = 0.35;
 
     m_view->SetPainter( m_painter.get() );
     // This fixes the zoom in and zoom out limits: