diff --git a/runtime/indent/awk.vim b/runtime/indent/awk.vim
index aad73ee..e653319 100644
--- a/runtime/indent/awk.vim
+++ b/runtime/indent/awk.vim
@@ -47,7 +47,7 @@
 
 function! GetAwkIndent()
 
-   " Find previous line and get it's indentation
+   " Find previous line and get its indentation
    let prev_lineno = s:Get_prev_line( v:lnum )
    if prev_lineno == 0
       return 0
diff --git a/runtime/indent/mma.vim b/runtime/indent/mma.vim
index 8298ad9..a76fa8e 100644
--- a/runtime/indent/mma.vim
+++ b/runtime/indent/mma.vim
@@ -57,7 +57,7 @@
     if getline(v:lnum) =~ '[^[]*]\s*$'
         " move to the closing bracket
         call search(']','bW')
-        " and find it's partner's indent
+        " and find its partner's indent
         let ind = indent(searchpair('\[','',']','bWn'))
     " same for ( blocks
     elseif getline(v:lnum) =~ '[^(]*)$'
diff --git a/runtime/indent/rmd.vim b/runtime/indent/rmd.vim
index 182b07c..83fe4e4 100644
--- a/runtime/indent/rmd.vim
+++ b/runtime/indent/rmd.vim
@@ -39,7 +39,7 @@
 function s:GetYamlIndent()
   let pline = getline(v:lnum - 1)
   if pline =~ ':\s*$'
-    return indent(v:lnum) + &sw
+    return indent(v:lnum) + shiftwidth()
   elseif pline =~ '^\s*- '
     return indent(v:lnum) + 2
   endif
diff --git a/runtime/indent/sh.vim b/runtime/indent/sh.vim
index 520d3ee..148a86e 100644
--- a/runtime/indent/sh.vim
+++ b/runtime/indent/sh.vim
@@ -3,10 +3,12 @@
 " Maintainer:          Christian Brabandt <cb@256bit.org>
 " Original Author:     Nikolai Weibull <now@bitwi.se>
 " Previous Maintainer: Peter Aronoff <telemachus@arpinum.org>
-" Latest Revision:     2019-03-25
+" Latest Revision:     2019-04-27
 " License:             Vim (see :h license)
 " Repository:          https://github.com/chrisbra/vim-sh-indent
 " Changelog:
+"          20190428  - De-indent fi correctly when typing with
+"                      https://github.com/chrisbra/vim-sh-indent/issues/15
 "          20190325  - Indent fi; correctly
 "                      https://github.com/chrisbra/vim-sh-indent/issues/14
 "          20190319  - Indent arrays (only zsh and bash)
@@ -127,7 +129,7 @@
   " Current line is a endif line, so get indent from start of "if condition" line
   " TODO: should we do the same for other "end" lines?
   if curline =~ '^\s*\%(fi\);\?\s*\%(#.*\)\=$'
-    let previous_line = searchpair('\<if\>', '', '\<fi\>', 'bnW')
+    let previous_line = searchpair('\<if\>', '', '\<fi\>\zs', 'bnW')
     if previous_line > 0
       let ind = indent(previous_line)
     endif