diff --git a/autoload/airline.vim b/autoload/airline.vim
index 36a73633..ca337da2 100644
--- a/autoload/airline.vim
+++ b/autoload/airline.vim
@@ -26,6 +26,7 @@ function! airline#add_inactive_statusline_func(name)
 endfunction
 
 function! airline#load_theme()
+  highlight! default link airline_warningmsg WarningMsg
   call airline#highlighter#load_theme()
   call airline#extensions#load_theme()
 endfunction
@@ -88,7 +89,7 @@ function! airline#get_statusline(builder, winnr, active)
     call a:builder.add_section('airline_z', s:get_section(a:winnr, 'z'))
     if a:active
       call a:builder.add_raw('%(')
-      call a:builder.add_section('warningmsg', s:get_section(a:winnr, 'warning', '', ''))
+      call a:builder.add_section('airline_warningmsg', s:get_section(a:winnr, 'warning', '', ''))
       call a:builder.add_raw('%)')
     endif
   endif
diff --git a/autoload/airline/themes/solarized.vim b/autoload/airline/themes/solarized.vim
index 9b90df76..521e46f8 100644
--- a/autoload/airline/themes/solarized.vim
+++ b/autoload/airline/themes/solarized.vim
@@ -112,7 +112,7 @@ function! s:generate()
         \ [s:N3[0].g, s:N3[1].g, s:N3[0].t, s:N3[1].t, s:N3[2]],
         \ s:NFa)
 
-  let g:airline#themes#solarized#palette.normal.warningmsg = [
+  let g:airline#themes#solarized#palette.normal.airline_warningmsg = [
         \ s:NW[0].g, s:NW[1].g, s:NW[0].t, s:NW[1].t, s:NW[2]]
 
   let g:airline#themes#solarized#palette.normal_modified = {