diff --git a/src/buffer_manager.cc b/src/buffer_manager.cc
index a521ad586..b55ecf732 100644
--- a/src/buffer_manager.cc
+++ b/src/buffer_manager.cc
@@ -124,9 +124,9 @@ CandidateList BufferManager::complete_buffer_name(StringView prefix,
         }
 
         if (prefix_match(match_name, real_prefix))
-            result.push_back(escape(name));
+            result.push_back(name);
         if (subsequence_match(name, real_prefix))
-            subsequence_result.push_back(escape(name));
+            subsequence_result.push_back(name);
     }
     return result.empty() ? subsequence_result : result;
 }
diff --git a/src/client_manager.cc b/src/client_manager.cc
index 3c1fb086f..bc833c62d 100644
--- a/src/client_manager.cc
+++ b/src/client_manager.cc
@@ -187,9 +187,9 @@ CandidateList ClientManager::complete_client_name(StringView prefix,
         const String& name = client->context().name();
 
         if (prefix_match(name, real_prefix))
-            result.push_back(escape(name));
+            result.push_back(name);
         if (subsequence_match(name, real_prefix))
-            subsequence_result.push_back(escape(name));
+            subsequence_result.push_back(name);
     }
     return result.empty() ? subsequence_result : result;
 }
diff --git a/src/file.cc b/src/file.cc
index 92cf6bece..b7697dab7 100644
--- a/src/file.cc
+++ b/src/file.cc
@@ -309,7 +309,7 @@ std::vector<String> complete_filename(StringView prefix,
     };
     std::vector<String> res = list_files(fileprefix, dirname, filter);
     for (auto& file : res)
-        file = escape(dirname + file);
+        file = dirname + file;
     std::sort(res.begin(), res.end());
     return res;
 }