diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim/lua/config/keymaps.lua
index 44ab87f5..6796bd39 100644
--- a/.config/nvim/lua/config/keymaps.lua
+++ b/.config/nvim/lua/config/keymaps.lua
@@ -80,6 +80,10 @@ map("n", "<leader>u<tab>", function()
   end
 end, { desc = "Toggle Tabline" })
 
+-- Comment box
+map("n", "]/", "/\\S\\zs\\s*╭<CR>zt", { desc = "Next block comment" })
+map("n", "[/", "?\\S\\zs\\s*╭<CR>zt", { desc = "Prev block comment" })
+
 -- Plugin Info
 map("n", "<leader>cif", "<cmd>LazyFormatInfo<cr>", { desc = "Formatting" })
 map("n", "<leader>cic", "<cmd>ConformInfo<cr>", { desc = "Conform" })
diff --git a/.config/nvim/lua/plugins/extras/ui/smooth-scrolling.lua b/.config/nvim/lua/plugins/extras/ui/smooth-scrolling.lua
index bceea4d4..b25b8f69 100644
--- a/.config/nvim/lua/plugins/extras/ui/smooth-scrolling.lua
+++ b/.config/nvim/lua/plugins/extras/ui/smooth-scrolling.lua
@@ -32,7 +32,7 @@ return {
 
     -- Start/end of line:
     map({ "n", "x" }, "0", "<Cmd>lua Scroll('0')<CR>")
-    map({ "n", "x" }, "^", "<Cmd>lua Scroll('^')<CR>")
+    map({ "n", "x" }, "_", "<Cmd>lua Scroll('_')<CR>")
     map({ "n", "x" }, "$", "<Cmd>lua Scroll('$', 0, 1)<CR>")
 
     -- Paragraph movements: