diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 2bb8c4d..8124444 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -152,7 +152,16 @@ function! vimwiki#base#resolve_link(link_text, ...)
       let link_infos.anchor = join(split_lnk[1:], '#')
     endif
     if link_text == ''  " because the link was of the form '#anchor'
-      let link_text = fnamemodify(source_file, ':p:t:r')
+      if source_file =~ vimwiki#vars#get_wikilocal('ext') . '$'
+          " Source file has expected extension. Remove it, it will be added later on
+          let ext_len = strlen(vimwiki#vars#get_wikilocal('ext'))
+          let link_text = fnamemodify(source_file, ':p:t')[:-ext_len-1]
+      else
+          " Source file has unexpected (or no) extension. A new file with the proper
+          " extension appended will be created
+          " let link_text = fnamemodify(source_file, ':p:t:r')
+      endif
+
     endif
   endif