diff --git a/after/ftplugin/python/jedi.vim b/after/ftplugin/python/jedi.vim
index 8174d9c..591f100 100644
--- a/after/ftplugin/python/jedi.vim
+++ b/after/ftplugin/python/jedi.vim
@@ -12,9 +12,12 @@ if g:jedi#auto_initialization
         if g:jedi#completions_command == "<C-Space>"
             " In terminals, <C-Space> sometimes equals <Nul>.
             imap <buffer> <Nul> <C-Space>
+            smap <buffer> <Nul> <C-Space>
         endif
         if g:jedi#completions_command != ""
             execute "inoremap <expr> <buffer> ".g:jedi#completions_command." jedi#complete_string(0)"
+            " A separate mapping for select mode: deletes and completes.
+            execute "snoremap <expr> <buffer> ".g:jedi#completions_command." '\<C-g>c'.jedi#complete_string(0)"
         endif
     endif
 endif