diff --git a/lua/telescope/builtin/__internal.lua b/lua/telescope/builtin/__internal.lua
index b0fea1743b..5929de96b0 100644
--- a/lua/telescope/builtin/__internal.lua
+++ b/lua/telescope/builtin/__internal.lua
@@ -26,6 +26,15 @@ local function apply_cwd_only_aliases(opts)
   return opts
 end
 
+---@return boolean
+local function buf_in_cwd(bufname, cwd)
+  if cwd:sub(-1) ~= Path.path.sep then
+    cwd = cwd .. Path.path.sep
+  end
+  local bufname_prefix = bufname:sub(1, #cwd)
+  return bufname_prefix == cwd
+end
+
 local internal = {}
 
 internal.builtin = function(opts)
@@ -536,7 +545,7 @@ internal.oldfiles = function(opts)
     local cwd = vim.loop.cwd() .. utils.get_separator()
     cwd = cwd:gsub([[\]], [[\\]])
     results = vim.tbl_filter(function(file)
-      return vim.fn.matchstrpos(file, cwd)[2] ~= -1
+      return buf_in_cwd(file, cwd)
     end, results)
   end
 
@@ -864,14 +873,6 @@ end
 internal.buffers = function(opts)
   opts = apply_cwd_only_aliases(opts)
 
-  local function buf_not_in_cwd(bufnr, cwd)
-    if cwd:sub(-1) ~= Path.path.sep then
-      cwd = cwd .. Path.path.sep
-    end
-    local bufname_prefix = vim.api.nvim_buf_get_name(bufnr):sub(1, #cwd)
-    return bufname_prefix ~= cwd
-  end
-
   local bufnrs = vim.tbl_filter(function(bufnr)
     if 1 ~= vim.fn.buflisted(bufnr) then
       return false
@@ -883,10 +884,13 @@ internal.buffers = function(opts)
     if opts.ignore_current_buffer and bufnr == vim.api.nvim_get_current_buf() then
       return false
     end
-    if opts.cwd_only and buf_not_in_cwd(bufnr, vim.loop.cwd()) then
+
+    local bufname = vim.api.nvim_buf_get_name(bufnr)
+
+    if opts.cwd_only and not buf_in_cwd(bufname, vim.loop.cwd()) then
       return false
     end
-    if not opts.cwd_only and opts.cwd and buf_not_in_cwd(bufnr, opts.cwd) then
+    if not opts.cwd_only and opts.cwd and not buf_in_cwd(bufname, opts.cwd) then
       return false
     end
     return true