diff --git a/common/string.cpp b/common/string.cpp
index dadb87f601..4fb9fe65e6 100644
--- a/common/string.cpp
+++ b/common/string.cpp
@@ -48,6 +48,8 @@ static const char illegalFileNameChars[] = "\\/:\"<>|";
  */
 wxString EscapeString( const wxString& aSource )
 {
+    return aSource;
+
     wxString converted;
 
     for( wxUniChar c: aSource )
@@ -90,6 +92,8 @@ wxString EscapeString( const wxString& aSource )
 
 wxString UnescapeString( const wxString& aSource )
 {
+    return aSource;
+
     wxString converted = aSource;
 
     converted.Replace( "&quot;", "\"" );
diff --git a/eeschema/dialogs/dialog_edit_one_field.cpp b/eeschema/dialogs/dialog_edit_one_field.cpp
index a378d69326..91ff6bb78a 100644
--- a/eeschema/dialogs/dialog_edit_one_field.cpp
+++ b/eeschema/dialogs/dialog_edit_one_field.cpp
@@ -40,6 +40,7 @@
 #include <sch_component.h>
 #include <template_fieldnames.h>
 #include <class_library.h>
+#include <sch_validators.h>
 
 #include <dialog_edit_one_field.h>
 
@@ -101,6 +102,9 @@ DIALOG_EDIT_ONE_FIELD::DIALOG_EDIT_ONE_FIELD( SCH_BASE_FRAME* aParent, const wxS
 void DIALOG_EDIT_ONE_FIELD::init()
 {
     SetInitialFocus( m_TextValue );
+    SCH_BASE_FRAME* parent = GetParent();
+    bool libedit = parent->IsType( FRAME_SCH_LIB_EDITOR );
+    m_TextValue->SetValidator( SCH_FIELD_VALIDATOR( libedit, m_fieldId, &m_text ) );
 
     // Disable options for graphic text editing which are not needed for fields.
     m_CommonConvert->Show( false );