diff --git a/eeschema/dialogs/dialog_eeschema_page_settings.cpp b/eeschema/dialogs/dialog_eeschema_page_settings.cpp
index baa2572799..fb6da751c1 100644
--- a/eeschema/dialogs/dialog_eeschema_page_settings.cpp
+++ b/eeschema/dialogs/dialog_eeschema_page_settings.cpp
@@ -39,19 +39,19 @@ DIALOG_EESCHEMA_PAGE_SETTINGS::~DIALOG_EESCHEMA_PAGE_SETTINGS()
     wxCHECK( cfg, /* void */ );
 
     cfg->m_PageSettings.export_paper = m_PaperExport->GetValue();
-    cfg->m_PageSettings.export_revision = m_RevisionExport->GetValue();
-    cfg->m_PageSettings.export_date = m_DateExport->GetValue();
-    cfg->m_PageSettings.export_title = m_TitleExport->GetValue();
-    cfg->m_PageSettings.export_company = m_CompanyExport->GetValue();
-    cfg->m_PageSettings.export_comment1 = m_Comment1Export->GetValue();
-    cfg->m_PageSettings.export_comment2 = m_Comment2Export->GetValue();
-    cfg->m_PageSettings.export_comment3 = m_Comment3Export->GetValue();
-    cfg->m_PageSettings.export_comment4 = m_Comment4Export->GetValue();
-    cfg->m_PageSettings.export_comment5 = m_Comment5Export->GetValue();
-    cfg->m_PageSettings.export_comment6 = m_Comment6Export->GetValue();
-    cfg->m_PageSettings.export_comment7 = m_Comment7Export->GetValue();
-    cfg->m_PageSettings.export_comment8 = m_Comment8Export->GetValue();
-    cfg->m_PageSettings.export_comment9 = m_Comment9Export->GetValue();
+    if ( !m_TextRevision->GetValue().IsEmpty() ) cfg->m_PageSettings.export_revision = m_RevisionExport->GetValue();
+    if ( !m_TextDate->GetValue().IsEmpty() ) cfg->m_PageSettings.export_date = m_DateExport->GetValue();
+    if ( !m_TextTitle->GetValue().IsEmpty() ) cfg->m_PageSettings.export_title = m_TitleExport->GetValue();
+    if ( !m_TextCompany->GetValue().IsEmpty() ) cfg->m_PageSettings.export_company = m_CompanyExport->GetValue();
+    if ( !m_TextComment1->GetValue().IsEmpty() ) cfg->m_PageSettings.export_comment1 = m_Comment1Export->GetValue();
+    if ( !m_TextComment2->GetValue().IsEmpty() ) cfg->m_PageSettings.export_comment2 = m_Comment2Export->GetValue();
+    if ( !m_TextComment3->GetValue().IsEmpty() ) cfg->m_PageSettings.export_comment3 = m_Comment3Export->GetValue();
+    if ( !m_TextComment4->GetValue().IsEmpty() ) cfg->m_PageSettings.export_comment4 = m_Comment4Export->GetValue();
+    if ( !m_TextComment5->GetValue().IsEmpty() ) cfg->m_PageSettings.export_comment5 = m_Comment5Export->GetValue();
+    if ( !m_TextComment6->GetValue().IsEmpty() ) cfg->m_PageSettings.export_comment6 = m_Comment6Export->GetValue();
+    if ( !m_TextComment7->GetValue().IsEmpty() ) cfg->m_PageSettings.export_comment7 = m_Comment7Export->GetValue();
+    if ( !m_TextComment8->GetValue().IsEmpty() ) cfg->m_PageSettings.export_comment8 = m_Comment8Export->GetValue();
+    if ( !m_TextComment9->GetValue().IsEmpty() ) cfg->m_PageSettings.export_comment9 = m_Comment9Export->GetValue();
 }
 
 
@@ -102,7 +102,6 @@ void DIALOG_EESCHEMA_PAGE_SETTINGS::onTransferDataToWindow()
     m_Comment7Export->SetValue( m_TextComment7->GetValue().IsEmpty() ? false : cfg->m_PageSettings.export_comment7 );
     m_Comment8Export->SetValue( m_TextComment8->GetValue().IsEmpty() ? false : cfg->m_PageSettings.export_comment8 );
     m_Comment9Export->SetValue( m_TextComment9->GetValue().IsEmpty() ? false : cfg->m_PageSettings.export_comment9 );
-    
 }