diff --git a/plugin/mappings.vim b/plugin/mappings.vim
index 55d7a9e..63d0cbf 100644
--- a/plugin/mappings.vim
+++ b/plugin/mappings.vim
@@ -115,6 +115,10 @@ else
   noremap <leader>p "+p
   noremap <leader>P "+P
 endif
+if has('nvim')
+  " Undo neovim's default mapping of Y to y$
+  unmap Y
+endif
 
 " Quickly access spelling menu
 inoremap <C-s> <C-g>u<C-X>s