diff --git a/autoload/airline.vim b/autoload/airline.vim
index 026722a7..f19d2fbe 100644
--- a/autoload/airline.vim
+++ b/autoload/airline.vim
@@ -71,10 +71,11 @@ endfunction
 
 function! airline#switch_matching_theme()
   if exists('g:colors_name')
-    let existing = substitute(g:colors_name, '-', '_', 'g')
+    let existing = g:airline_theme
+    let theme = substitute(g:colors_name, '-', '_', 'g')
     try
-      let palette = g:airline#themes#{g:colors_name}#palette
-      call airline#switch_theme(g:colors_name)
+      let palette = g:airline#themes#{theme}#palette
+      call airline#switch_theme(theme)
       return 1
     catch
       for map in items(g:airline_theme_map)