diff --git a/components/files/escape.cpp b/components/files/escape.cpp
index f28870c70..3c3d04d51 100644
--- a/components/files/escape.cpp
+++ b/components/files/escape.cpp
@@ -27,7 +27,8 @@ namespace Files
     std::string EscapeHashString::processString(const std::string & str)
     {
         std::string temp = boost::replace_all_copy<std::string>(str, std::string() + (char)escape_hash_filter::sEscape + (char)escape_hash_filter::sHashIdentifier, "#");
-        boost::replace_all(temp, std::string() + (char)escape_hash_filter::sEscape + (char)escape_hash_filter::sEscapeIdentifier, std::string((char)escape_hash_filter::sEscape, 1));
+        auto format = std::string(1, (char)escape_hash_filter::sEscape);
+        boost::replace_all(temp, std::string() + (char)escape_hash_filter::sEscape + (char)escape_hash_filter::sEscapeIdentifier, format);
         return temp;
     }
 
diff --git a/components/files/escape.hpp b/components/files/escape.hpp
index 2017c2ed2..64410f3ab 100644
--- a/components/files/escape.hpp
+++ b/components/files/escape.hpp
@@ -78,6 +78,12 @@ namespace Files
                     mFinishLine = true;
                 }
             }
+            else if (character == sEscape)
+            {
+                mNext.push(sEscape);
+                mNext.push(sEscapeIdentifier);
+                record = false;
+            }
             else if (mPrevious == sEscape)
             {
                 mNext.push(sEscape);