diff --git a/config/nvim/lua/config/keymaps.lua b/config/nvim/lua/config/keymaps.lua
index 75cf985..b0ab01a 100644
--- a/config/nvim/lua/config/keymaps.lua
+++ b/config/nvim/lua/config/keymaps.lua
@@ -21,6 +21,11 @@ keymap("n", "<C-b>", ":Telescope buffers<CR>")
 -- Formatting
 keymap("n", "<leader>f", vim.lsp.buf.format, { desc = "Format buffer" })
 
+-- TreeSJ
+keymap("n", "gs", ":TSJSplit<CR>", { desc = "Split code block" })
+keymap("n", "gj", ":TSJJoin<CR>", { desc = "Join code block" })
+keymap("n", "gm", ":TSJToggle<CR>", { desc = "Split or join code block" })
+
 -- LSP
 require("config.keymaps.lsp")
 require("config.keymaps.nvim-test")
diff --git a/config/nvim/lua/config/plugins/treesj.lua b/config/nvim/lua/config/plugins/treesj.lua
index 5803191..5932a65 100644
--- a/config/nvim/lua/config/plugins/treesj.lua
+++ b/config/nvim/lua/config/plugins/treesj.lua
@@ -3,9 +3,9 @@ return {
 
   dependencies = { "nvim-treesitter/nvim-treesitter" },
 
-  keys = { "gm", "gj", "gs" },
-
   config = function()
-    require("treesj").setup()
+    require("treesj").setup({
+      use_default_keymaps = false,
+    })
   end,
 }