diff --git a/lua/code-completion.lua b/lua/code-completion.lua
index 0a1cb0f..6f02318 100644
--- a/lua/code-completion.lua
+++ b/lua/code-completion.lua
@@ -18,11 +18,17 @@ cmp.setup({
 
 	-- Add borders to the windows
 	view = {
-		entries = "custom",
+		entries = { name = "custom", selection_order = "near_cursor" },
 	},
 	window = {
-		completion = cmp.config.window.bordered(),
-		documentation = cmp.config.window.bordered(),
+		completion = cmp.config.window.bordered({
+			border = "rounded",
+			winhighlight = "Normal:CmpPmenu,FloatBorder:CmpBorder,CursorLine:CmpSel,Search:None",
+		}),
+		documentation = cmp.config.window.bordered({
+			border = "rounded",
+			winhighlight = "Normal:CmpDoc,FloatBorder:CmpBorderDoc,CursorLine:CmpSel,Search:None",
+		}),
 	},
 
 	-- experimental settings