diff --git a/common/gbr_metadata.cpp b/common/gbr_metadata.cpp
index 49aba7c766..8e0f2e45b7 100644
--- a/common/gbr_metadata.cpp
+++ b/common/gbr_metadata.cpp
@@ -403,7 +403,7 @@ wxString ConvertNotAllowedCharsInGerber( const wxString& aString, bool aAllowUtf
      * 16 bits sequence unicode
      * However if aAllowUtf8Chars is true only unautorized codes will be escaped, because some
      * Gerber files accept UTF8 chars.
-     * unautorized codes are ',' '*' '%' '\' and are used as separators in Gerber files
+     * unautorized codes are ',' '*' '%' '\' '"' and are used as separators in Gerber files
      */
     wxString txt;
 
@@ -424,6 +424,11 @@ wxString ConvertNotAllowedCharsInGerber( const wxString& aString, bool aAllowUtf
             convert = true;
             break;
 
+        case '"':
+            if( aQuoteString )
+                convert = true;
+            break;
+
         default:
             break;
         }