diff --git a/nvim/lua/jj-snacks.lua b/nvim/lua/jj-snacks.lua
index 26448b1..5a5650a 100644
--- a/nvim/lua/jj-snacks.lua
+++ b/nvim/lua/jj-snacks.lua
@@ -50,7 +50,7 @@ Snacks.picker.jj_log = function(file)
 				table.insert(args, '--reversed')
 			end
 			if file then
-				table.insert(args, file)
+				table.insert(args, string.format('file:"%s"', file))
 			end
 			vim.list_extend(args, opts.args or {})
 			return require('snacks.picker.source.proc').proc(
@@ -109,16 +109,28 @@ Snacks.picker.jj_log = function(file)
 			return ret
 		end,
 		preview = function(ctx)
-			local M = require 'snacks.picker.preview'
 			-- local cmd = { 'jj', 'log', '-r=' .. ctx.item.change_id, "--git" }
 			local cmd = { "git", "show", ctx.item.commit }
-			M.cmd(cmd, ctx, { ft = "git" })
+			Snacks.picker.preview.cmd(cmd, ctx, { ft = "git" })
 		end,
 		confirm = function(picker, item)
 			picker:close()
 			Snacks.picker.jj_show(item.change_id)
 		end,
 		sort = { fields = { 'score:desc', 'idx' } },
+		win = {
+			input = {
+				keys = {
+					["<a-e>"] = { "jj_edit", mode = { "i" } },
+				},
+			},
+		},
+		actions = {
+			jj_edit = function(picker, item)
+				picker:close()
+				vim.cmd(string.format("J edit %s", item.change_id))
+			end
+		},
 	})
 end
 
@@ -190,13 +202,35 @@ Snacks.picker.jj_show = function(ref)
 			return ret
 		end,
 		preview = function(ctx)
-			local M = require "snacks.picker.preview"
 			if ctx.item.status == "A" or ctx.item.status == "?" then
-				M.file(ctx)
+				Snacks.picker.preview.file(ctx)
 			else
-				M.cmd({ "jj", "diff", "--git", "--no-pager", ctx.item.file }, ctx, { ft = "diff" })
+				Snacks.picker.preview.cmd(
+					{ "jj", "diff", "--git", "--no-pager", ctx.item.file },
+					ctx,
+					{ ft = "diff" }
+				)
 			end
 		end,
 		sort = { fields = { 'score:desc', 'idx' } },
+		win = {
+			input = {
+				keys = {
+					["<a-s>"] = { "jj_split", mode = { "i" } },
+				},
+			},
+		},
+		actions = {
+			jj_split = function(picker)
+				local items = vim.iter(picker:selected())
+					:map(function(i) return i.file end)
+					:totable()
+				picker:close()
+				vim.cmd(string.format(
+					'J split "\'%s\'"',
+					table.concat(items, "' | '")
+				))
+			end
+		},
 	})
 end
diff --git a/nvim/lua/plugins/git.lua b/nvim/lua/plugins/git.lua
index f5f8d4b..51f3d9c 100644
--- a/nvim/lua/plugins/git.lua
+++ b/nvim/lua/plugins/git.lua
@@ -100,7 +100,7 @@ return {
 			end, { desc = "jj log all" })
 			vim.keymap.set("n", "<leader>je", cmd.edit, { desc = "JJ edit" })
 			vim.keymap.set("n", "<leader>jn", cmd.new, { desc = "JJ new" })
-			vim.keymap.set("n", "<leader>jsq", cmd.squash, { desc = "JJ squash" })
+			vim.keymap.set("n", "<leader>jq", cmd.squash, { desc = "JJ squash" })
 			vim.keymap.set("n", "<leader>ju", cmd.undo, { desc = "JJ undo" })
 			vim.keymap.set("n", "<leader>jy", cmd.redo, { desc = "JJ redo" })
 			vim.keymap.set("n", "<leader>jr", cmd.rebase, { desc = "JJ rebase" })
diff --git a/nvim/lua/plugins/snacks.lua b/nvim/lua/plugins/snacks.lua
index e5f815a..da73861 100644
--- a/nvim/lua/plugins/snacks.lua
+++ b/nvim/lua/plugins/snacks.lua
@@ -102,6 +102,7 @@ return {
 							["<c-e>"] = { function() vim.cmd "startinsert!" end, mode = { "i" } },
 							["<c-/>"] = { "toggle_help_input", mode = { "i" } },
 							["<c-?>"] = { "toggle_help_input", mode = { "i" } },
+							["<c-_>"] = { "toggle_help_input", mode = { "i" } },
 						},
 					},
 				},