diff --git a/autoload/airline/themes/jellybeans.vim b/autoload/airline/themes/jellybeans.vim
index 465fae5..6fa6dff 100644
--- a/autoload/airline/themes/jellybeans.vim
+++ b/autoload/airline/themes/jellybeans.vim
@@ -10,16 +10,21 @@ let s:N1 = airline#themes#get_highlight('DbgCurrent', 'bold')
 let s:N2 = airline#themes#get_highlight('Folded')
 let s:N3 = airline#themes#get_highlight('NonText')
 let g:airline#themes#jellybeans#normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
+let g:airline#themes#jellybeans#normal_modified = {
+      \ 'statusline': [ '#ffb964', '', 215, '', '' ]
+      \ }
 
 let s:I1 = airline#themes#get_highlight('DiffAdd', 'bold')
 let s:I2 = s:N2
 let s:I3 = s:N3
 let g:airline#themes#jellybeans#insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
+let g:airline#themes#jellybeans#insert_modified = g:airline#themes#jellybeans#normal_modified
 
 let s:R1 = airline#themes#get_highlight('WildMenu', 'bold')
 let s:R2 = s:N2
 let s:R3 = s:N3
 let g:airline#themes#jellybeans#replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3, s:file)
+let g:airline#themes#jellybeans#replace_modified = g:airline#themes#jellybeans#normal_modified
 
 " Sometimes you want to mix and match colors from different groups, you can do
 " that with this method.
@@ -27,6 +32,7 @@ let s:V1 = airline#themes#get_highlight2(['TabLineSel', 'bg'], ['DiffDelete', 'b
 let s:V2 = s:N2
 let s:V3 = s:N3
 let g:airline#themes#jellybeans#visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
+let g:airline#themes#jellybeans#visual_modified = g:airline#themes#jellybeans#normal_modified
 
 " And of course, you can always do it manually as well.
 let s:IA = [ '#444444', '#1c1c1c', 237, 234 ]
diff --git a/plugin/airline.vim b/plugin/airline.vim
index 7439b91..7904b74 100644
--- a/plugin/airline.vim
+++ b/plugin/airline.vim
@@ -71,7 +71,7 @@ endfunction
 function! s:sync_active_winnr()
   if winnr() != s:active_winnr
     " prevent ctrlp statusline from getting overwritten
-    if match(&statusline, 'CtrlPlight') >= 0
+    if get(g:, 'loaded_ctrlp', 0) && match(&statusline, 'CtrlPlight') >= 0
       return
     endif
     call s:on_window_changed()