diff --git a/autoload/EasyMotion/command_line.vim b/autoload/EasyMotion/command_line.vim
index 51fb03f..035ccb8 100644
--- a/autoload/EasyMotion/command_line.vim
+++ b/autoload/EasyMotion/command_line.vim
@@ -142,6 +142,8 @@ function! s:search.on_enter(cmdline) "{{{
             call EasyMotion#highlight#add_highlight('\_.*',
                                                 \ g:EasyMotion_hl_group_shade)
         endif
+    endif
+    if g:EasyMotion_cursor_highlight
         call EasyMotion#highlight#add_highlight('\%#',
                                               \ g:EasyMotion_hl_inc_cursor)
     endif
diff --git a/plugin/EasyMotion.vim b/plugin/EasyMotion.vim
index c1b74fc..f3b9b9f 100644
--- a/plugin/EasyMotion.vim
+++ b/plugin/EasyMotion.vim
@@ -3,7 +3,7 @@
 " Author: Kim Silkebækken <kim.silkebaekken+vim@gmail.com>
 "         haya14busa <hayabusa1419@gmail.com>
 " Source: https://github.com/Lokaltog/vim-easymotion
-" Last Change: 20 Feb 2014.
+" Last Change: 21 Mar 2014.
 " == Script initialization {{{
 if expand("%:p") ==# expand("<sfile>:p")
   unlet! g:EasyMotion_loaded
@@ -38,7 +38,7 @@ let g:EasyMotion_space_jump_first   = get(g: , 'EasyMotion_space_jump_first'   ,
 let g:EasyMotion_inc_highlight      = get(g: , 'EasyMotion_inc_highlight'      , 1)
 let g:EasyMotion_move_highlight     = get(g: , 'EasyMotion_move_highlight'     , 1)
 let g:EasyMotion_landing_highlight  = get(g: , 'EasyMotion_landing_highlight'  , 0)
-let g:EasyMotion_cursor_highlight   = get(g: , 'EasyMotion_cursor_highlight'   , 0)
+let g:EasyMotion_cursor_highlight   = get(g: , 'EasyMotion_cursor_highlight'   , 1)
 let g:EasyMotion_use_regexp         = get(g: , 'EasyMotion_use_regexp'         , 1)
 let g:EasyMotion_add_search_history = get(g: , 'EasyMotion_add_search_history' , 1)
 let g:EasyMotion_off_screen_search  = get(g: , 'EasyMotion_off_screen_search'  , 1)
diff --git a/t/easymotion_spec.vim b/t/easymotion_spec.vim
index 95b876e..ae1fae4 100644
--- a/t/easymotion_spec.vim
+++ b/t/easymotion_spec.vim
@@ -1,7 +1,7 @@
 "=============================================================================
 " FILE: t/easymotion_spec.vim
 " AUTHOR: haya14busa
-" Last Change: 22 Feb 2014.
+" Last Change: 21 Mar 2014.
 " Test: https://github.com/kana/vim-vspec
 " Refer: https://github.com/rhysd/clever-f.vim
 " Description: EasyMotion test with vim-vspec
@@ -480,7 +480,7 @@ describe 'Default settings'
         Expect g:EasyMotion_inc_highlight      ==# 1
         Expect g:EasyMotion_move_highlight     ==# 1
         Expect g:EasyMotion_landing_highlight  ==# 0
-        Expect g:EasyMotion_cursor_highlight   ==# 0
+        Expect g:EasyMotion_cursor_highlight   ==# 1
         Expect g:EasyMotion_use_regexp         ==# 1
         Expect g:EasyMotion_add_search_history ==# 1
         Expect g:EasyMotion_off_screen_search  ==# 1