diff --git a/doc/telescope.txt b/doc/telescope.txt
index a571bc1..89bcc87 100644
--- a/doc/telescope.txt
+++ b/doc/telescope.txt
@@ -1052,10 +1052,10 @@ builtin.git_bcommits({opts})                *telescope.builtin.git_bcommits()*
                                    {"git","log","--pretty=oneline","--abbrev-commit"}
 
 
-builtin.git_bcommits_range({opts})   *telescope.builtin.git_bcommits_range()*
+builtin.git_bcommits_range({opts})    *telescope.builtin.git_bcommits_range()*
     Lists commits for a range of lines in the current buffer with diff preview
-    In visual mode, lists commits for the selected lines
-    With operator mode enabled, lists commits inside the text object/motion
+    In visual mode, lists commits for the selected lines With operator mode
+    enabled, lists commits inside the text object/motion
     - Default keymaps or your overridden `select_` keys:
       - `<cr>`: checks out the currently selected commit
       - `<c-v>`: opens a diff in a vertical split
@@ -1075,13 +1075,14 @@ builtin.git_bcommits_range({opts})   *telescope.builtin.git_bcommits_range()*
         {git_command}  (table)    command that will be executed. the last
                                   element must be "-L".
                                   {"git","log","--pretty=oneline","--abbrev-commit","--no-patch","-L"}
-        {from}         (number)   the first line number in the range
-                                  (default: current line)
-        {to}           (number)   the last line number in the range
-                                  (default: the value of `from`)
+        {from}         (number)   the first line number in the range (default:
+                                  current line)
+        {to}           (number)   the last line number in the range (default:
+                                  the value of `from`)
         {operator}     (boolean)  select lines in operator-pending mode
                                   (default: false)
 
+
 builtin.git_branches({opts})                *telescope.builtin.git_branches()*
     List branches for current directory, with output from `git log --oneline`
     shown in the preview window
diff --git a/lua/telescope/pickers.lua b/lua/telescope/pickers.lua
index 86175cd..12a6ba1 100644
--- a/lua/telescope/pickers.lua
+++ b/lua/telescope/pickers.lua
@@ -430,16 +430,16 @@ function Picker:find()
   end
 
   if vim.tbl_contains({ "insert", "normal" }, self.initial_mode) then
-    -- Note that `feedkeys()` should not be used to change modes, as
-    -- the user may have queued keystrokes that would be processed first,
-    -- interfering with desired operation.
+    local mode = vim.fn.mode()
+    local keys
     if self.initial_mode == "normal" then
-      -- Ensure cursor is at always at end of prompt w/o default_text
-      vim.cmd "normal! $"
+      -- n: A<ESC> makes sure cursor is at always at end of prompt w/o default_text
+      keys = mode ~= "n" and "<ESC>A<ESC>" or "A<ESC>"
     else
       -- always fully retrigger insert mode: required for going from one picker to next
-      vim.cmd "startinsert!"
+      keys = mode ~= "n" and "<ESC>A" or "A"
     end
+    a.nvim_feedkeys(a.nvim_replace_termcodes(keys, true, false, true), "n", true)
   else
     utils.notify(
       "pickers.find",