diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
index 46dbda2..ffaf7f1 100644
--- a/doc/vimwiki.txt
+++ b/doc/vimwiki.txt
@@ -153,8 +153,9 @@ course.
 [count]<Leader>ww
         Open index file of the [count]'s wiki.
 
-        <Leader>ww opens the first wiki from |g:vimwiki_list|.
-        1<Leader>ww as above, opens the first wiki from |g:vimwiki_list|.
+        <Leader>ww opens the first wiki from |g:vimwiki_list| if no wiki is
+        open. Otherwise the index of the currently active wiki is opened.
+        1<Leader>ww opens the first wiki from |g:vimwiki_list|.
         2<Leader>ww opens the second wiki from |g:vimwiki_list|.
         3<Leader>ww opens the third wiki from |g:vimwiki_list|.
         etc.
diff --git a/plugin/vimwiki.vim b/plugin/vimwiki.vim
index b9e42a0..6e2290e 100644
--- a/plugin/vimwiki.vim
+++ b/plugin/vimwiki.vim
@@ -374,9 +374,9 @@ command! VimwikiShowVersion call s:get_version()
 
 " <Plug> global definitions
 nnoremap <silent><script> <Plug>VimwikiIndex
-    \ :<C-U>call vimwiki#base#goto_index(v:count1)<CR>
+    \ :<C-U>call vimwiki#base#goto_index(v:count)<CR>
 nnoremap <silent><script> <Plug>VimwikiTabIndex
-    \ :<C-U>call vimwiki#base#goto_index(v:count1, 1)<CR>
+    \ :<C-U>call vimwiki#base#goto_index(v:count, 1)<CR>
 nnoremap <silent><script> <Plug>VimwikiUISelect
     \ :VimwikiUISelect<CR>
 nnoremap <silent><script> <Plug>VimwikiDiaryIndex