diff --git a/keymap.toml b/keymap.toml
index 0971321..d06869b 100644
--- a/keymap.toml
+++ b/keymap.toml
@@ -34,7 +34,7 @@ keymap = [
 
 	# Navigation
 	{ on = "h", run = "leave", desc = "Go back to the parent directory" },
-	{ on = "l", run = "enter", desc = "Enter the child directory" },
+	# { on = "l", run = "enter", desc = "Enter the child directory" },
 
 	{ on = "<Left>",  run = "leave",    desc = "Go back to the parent directory" },
 	{ on = "<Right>", run = "enter",    desc = "Enter the child directory" },
@@ -327,3 +327,8 @@ keymap = [
 on   = "!"
 run  = 'shell "$SHELL" --block --confirm'
 desc = "Open shell here"
+
+[[manager.prepend_keymap]]
+on   = "l"
+run  = "plugin --sync smart-enter"
+desc = "Enter the child directory, or open the file"
diff --git a/plugins/smart-enter.yazi/init.lua b/plugins/smart-enter.yazi/init.lua
new file mode 100644
index 0000000..2ea705d
--- /dev/null
+++ b/plugins/smart-enter.yazi/init.lua
@@ -0,0 +1,7 @@
+--- @sync entry
+return {
+	entry = function()
+		local h = cx.active.current.hovered
+		ya.manager_emit(h and h.cha.is_dir and "enter" or "open", { hovered = true })
+	end,
+}