diff --git a/eeschema/dialogs/dialog_lib_symbol_properties.cpp b/eeschema/dialogs/dialog_lib_symbol_properties.cpp
index 809148afc9..ad23b66c4b 100644
--- a/eeschema/dialogs/dialog_lib_symbol_properties.cpp
+++ b/eeschema/dialogs/dialog_lib_symbol_properties.cpp
@@ -306,7 +306,7 @@ bool DIALOG_LIB_SYMBOL_PROPERTIES::TransferDataFromWindow()
         return false;
 
     // We need to keep the name and the value the same at the moment!
-    wxString   newName = m_fields->at( VALUE_FIELD ).GetText();
+    wxString   newName = EscapeString( m_fields->at( VALUE_FIELD ).GetText(), CTX_LIBID );
     wxString   oldName = m_libEntry->GetName();
 
     if( oldName != newName )
diff --git a/eeschema/tools/symbol_editor_control.cpp b/eeschema/tools/symbol_editor_control.cpp
index 9d61804ba2..cc448604e9 100644
--- a/eeschema/tools/symbol_editor_control.cpp
+++ b/eeschema/tools/symbol_editor_control.cpp
@@ -310,7 +310,7 @@ int SYMBOL_EDITOR_CONTROL::RenameSymbol( const TOOL_EVENT& aEvent )
             if( dlg.ShowModal() != wxID_OK )
                 return 0;   // canceled by user
 
-            newName = dlg.GetValue();
+            newName = EscapeString( dlg.GetValue(), CTX_LIBID );
             newName.Trim( true ).Trim( false );
 
             if( newName.IsEmpty() )