diff --git a/lua/telekasten.lua b/lua/telekasten.lua
index b1a67b3..cbdc85e 100644
--- a/lua/telekasten.lua
+++ b/lua/telekasten.lua
@@ -1695,7 +1695,7 @@ end
 local function RenameNote()
     local oldfile = Pinfo:new({ filepath = vim.fn.expand("%:p"), M.Cfg })
 
-    tkutils.prompt_title(M.Cfg.extension, function(newname)
+    tkutils.prompt_title(M.Cfg.extension, oldfile.title, function(newname)
         local newpath = newname:match("(.*/)") or ""
         newpath = M.Cfg.home .. "/" .. newpath
 
@@ -2089,7 +2089,7 @@ local function CreateNoteSelectTemplate(opts)
         return
     end
 
-    tkutils.prompt_title(M.Cfg.extension, function(title)
+    tkutils.prompt_title(M.Cfg.extension, nil, function(title)
         on_create_with_template(opts, title)
     end)
 end
@@ -2162,7 +2162,7 @@ local function CreateNote(opts)
         return CreateNoteSelectTemplate(opts)
     end
 
-    tkutils.prompt_title(M.Cfg.extension, function(title)
+    tkutils.prompt_title(M.Cfg.extension, nil, function(title)
         on_create(opts, title)
     end)
 end
diff --git a/lua/telekasten/utils.lua b/lua/telekasten/utils.lua
index 87df324..4110db5 100644
--- a/lua/telekasten/utils.lua
+++ b/lua/telekasten/utils.lua
@@ -6,12 +6,14 @@ local function strip_extension(str, ext)
     return str:gsub("(" .. ext:gsub("%.", "%%.") .. ")$", "")
 end
 
-function M.prompt_title(ext, callback)
+function M.prompt_title(ext, defaultFile, callback)
     local canceledStr = "__INPUT_CANCELLED__"
 
     vim.ui.input({
         prompt = "Title: ",
         cancelreturn = canceledStr,
+        completion = "file",
+        default = defaultFile
     }, function(title)
         if not title then
             title = ""