diff --git a/share/functions/fish_vi_key_bindings.fish b/share/functions/fish_vi_key_bindings.fish
index c89f6f16b..cb6309782 100644
--- a/share/functions/fish_vi_key_bindings.fish
+++ b/share/functions/fish_vi_key_bindings.fish
@@ -199,10 +199,12 @@ function fish_vi_key_bindings -d "vi-like key bindings for fish"
       bind gE backward-word
       bind w forward-word
       bind W forward-word
-      bind e forward-word
-      bind E forward-word
+      bind -M visual e forward-word
+      bind -M visual E forward-word
 
       bind -M visual -m default d kill-selection end-selection force-repaint
+      bind -M visual -m default x kill-selection end-selection force-repaint
+      bind -M visual -m default X kill-whole-line end-selection force-repaint
       bind -M visual -m default y kill-selection yank end-selection force-repaint
       bind -M visual -m default '"*y' "commandline -s | xsel -p" end-selection force-repaint