diff --git a/lua/telescope/config.lua b/lua/telescope/config.lua
index c42e500..192056d 100644
--- a/lua/telescope/config.lua
+++ b/lua/telescope/config.lua
@@ -13,8 +13,6 @@ local function first_non_null(...)
 end
 
 -- TODO: Add other major configuration points here.
--- border
--- borderchars
 -- selection_strategy
 
 local config = {}
@@ -38,6 +36,9 @@ function config.set_defaults(defaults)
   set("width", 0.75)
   set("winblend", 0)
 
+  set("border", {})
+  set("borderchars", { '─', '│', '─', '│', '╭', '╮', '╯', '╰'})
+
   -- Builtin configuration
 
   -- List that will be executed.
diff --git a/lua/telescope/pickers.lua b/lua/telescope/pickers.lua
index 637c235..87d3145 100644
--- a/lua/telescope/pickers.lua
+++ b/lua/telescope/pickers.lua
@@ -116,8 +116,8 @@ function Picker:new(opts)
       results_width = get_default(opts.results_width, 0.8),
 
       -- Border config
-      border = get_default(opts.border, {}),
-      borderchars = get_default(opts.borderchars, { '─', '│', '─', '│', '╭', '╮', '╯', '╰'}),
+      border = get_default(opts.border, config.values.border),
+      borderchars = get_default(opts.borderchars, config.values.borderchars),
 
       -- WIP:
       horizontal_config = get_default(opts.horizontal_config, config.values.horizontal_config),