diff --git a/autoload/comfortable_motion.vim b/autoload/comfortable_motion.vim
index 5aa3a23..2d0f159 100644
--- a/autoload/comfortable_motion.vim
+++ b/autoload/comfortable_motion.vim
@@ -87,5 +87,9 @@ function! comfortable_motion#flick(impulse)
   let s:comfortable_motion_state.impulse += a:impulse
 endfunction
 
+function! comfortable_motion#stop()
+  let s:comfortable_motion_state.velocity = 0.0
+endfunction
+
 let &cpo = s:save_cpo
 unlet s:save_cpo
diff --git a/plugin/comfortable_motion.vim b/plugin/comfortable_motion.vim
index 9935f0d..e7ba624 100644
--- a/plugin/comfortable_motion.vim
+++ b/plugin/comfortable_motion.vim
@@ -24,6 +24,7 @@ if !exists('g:comfortable_motion_no_default_key_mappings') ||
   nnoremap <silent> <C-b> :call comfortable_motion#flick(-200)<CR>
 endif
 
+autocmd TermEnter * call comfortable_motion#stop()
 
 let &cpo = s:save_cpo
 unlet s:save_cpo