diff --git a/data/core/commands/doc.lua b/data/core/commands/doc.lua
index 90e0eee9..a564c6f6 100644
--- a/data/core/commands/doc.lua
+++ b/data/core/commands/doc.lua
@@ -405,12 +405,14 @@ local commands = {
   
   ["doc:set-cursor-word"] = function(x, y, clicks) 
     local line, col = dv():resolve_screen_position(x, y)
+    doc():set_selection(line, col, line, col)
     command.perform("doc:select-word")
     dv().mouse_selecting = { line, col }
   end,
   
   ["doc:set-cursor-line"] = function(x, y, clicks) 
     local line, col = dv():resolve_screen_position(x, y)
+    doc():set_selection(line, col, line, col)
     command.perform("doc:select-lines")
     dv().mouse_selecting = { line, col }
   end,
diff --git a/data/core/keymap-macos.lua b/data/core/keymap-macos.lua
index aa4cccec..8d23e050 100644
--- a/data/core/keymap-macos.lua
+++ b/data/core/keymap-macos.lua
@@ -96,8 +96,8 @@ local function keymap_macos(keymap)
     ["shift+lclick"] = "doc:select-to-cursor",
     ["ctrl+lclick"] = "doc:split-cursor",
     ["lclick"] = "doc:set-cursor",
-    ["dlclick"] = "doc:select-word",
-    ["tlclick"] = "doc:select-lines",
+    ["dlclick"] = "doc:set-cursor-word",
+    ["tlclick"] = "doc:set-cursor-line",
     ["shift+left"] = "doc:select-to-previous-char",
     ["shift+right"] = "doc:select-to-next-char",
     ["shift+up"] = "doc:select-to-previous-line",