diff --git a/lua/user/autocommands.lua b/lua/user/autocommands.lua
index dba7e48..aca7a9e 100644
--- a/lua/user/autocommands.lua
+++ b/lua/user/autocommands.lua
@@ -33,6 +33,16 @@ vim.cmd([[
     autocmd!
     autocmd User AlphaReady set showtabline=0 | autocmd BufUnload <buffer> set showtabline=2
   augroup end
+
+  augroup neovim_terminal
+    autocmd!
+    " Enter Terminal-mode (insert) automatically
+    autocmd TermOpen * startinsert
+    " Disables number lines on terminal buffers
+    autocmd TermOpen * :set nonumber norelativenumber
+    " allows you to use Ctrl-c on terminal window
+    autocmd TermOpen * nnoremap <buffer> <C-c> i<C-c>
+  augroup END
 ]])
 
 -- for fix error last close buffer
diff --git a/lua/user/keymaps.lua b/lua/user/keymaps.lua
index 3897db3..e132b02 100644
--- a/lua/user/keymaps.lua
+++ b/lua/user/keymaps.lua
@@ -62,7 +62,7 @@ keymap("n", "<C-_>", "<esc><cmd>lua require('Comment.api').toggle.linewise.curre
 -- keymap("i", "<C-l>", "<esc><cmd>lua _LIVE_SERVER()<cr>", opts)
 
 -- ALT + l to open terminal and run live-server
-keymap("n", "<A-l>", "<cmd>terminal<cr>$i<Right>live-server<cr>", opts)
+keymap("n", "<A-l>", "<cmd>terminal<cr>live-server<cr>", opts)
 
 -- Resize with arrows
 -- cona
diff --git a/lua/user/whichkey.lua b/lua/user/whichkey.lua
index 727c137..331e7e5 100644
--- a/lua/user/whichkey.lua
+++ b/lua/user/whichkey.lua
@@ -327,7 +327,7 @@ local mappings = {
 		r = { "<cmd>RunCode<CR>", "Run Code" },
 		f = { "<cmd>RunFile<CR>", "Run File" },
 		p = { "<cmd>RunProject<CR>", "Run Project" },
-		g = { "<cmd>terminal<cr>$i<Right>gradle run<cr>" .. trn, "Run Gradle" },
+		g = { "<cmd>terminal<cr>gradle run<cr>", "Run Gradle" },
 		m = {
 			"<cmd>ToggleTerm size=70 direction=float<cr>mvn exec:java -Dexec.mainClass=com.pojokcode.App<cr>",
 			"Run MVN",