diff --git a/README.md b/README.md
index 8af3f1b..2ea032e 100644
--- a/README.md
+++ b/README.md
@@ -35,8 +35,6 @@ Automatically displays all buffers when there's only one tab open.  This is disa
 
 ![tabline](https://f.cloud.github.com/assets/306502/1072623/44c292a0-1495-11e3-9ce6-dcada3f1c536.gif)
 
-Note: This extension only works in terminal vim at the moment.
-
 ## Seamless integration
 
 vim-airline integrates with a variety of plugins out of the box.  These extensions will be lazily loaded if and only if you have the other plugins installed (and of course you can turn them off).
diff --git a/autoload/airline/extensions/tabline.vim b/autoload/airline/extensions/tabline.vim
index fd10f82..0385413 100644
--- a/autoload/airline/extensions/tabline.vim
+++ b/autoload/airline/extensions/tabline.vim
@@ -5,6 +5,9 @@ let s:fmod = get(g:, 'airline#extensions#tabline#fnamemod', ':p:.')
 let s:excludes = get(g:, 'airline#extensions#tabline#excludes', [])
 
 function! airline#extensions#tabline#init(ext)
+  if has('gui_running')
+    set guioptions-=e
+  endif
   set showtabline=2
   set tabline=%!airline#extensions#tabline#get()
 
diff --git a/doc/airline.txt b/doc/airline.txt
index 190fcec..9436e27 100644
--- a/doc/airline.txt
+++ b/doc/airline.txt
@@ -302,7 +302,7 @@ virtualenv <https://github.com/jmcantrell/vim-virtualenv>
 * configure filename match rules to exclude from the tabline. >
   let g:airline#extensions#tabline#excludes = []
 <
-Note: This extension only works in terminal vim at the moment.
+Note: Enabling this extension will modify |showtabline| and |guioptions|.
 
 ==============================================================================
 ADVANCED CUSTOMIZATION                      *airline-advanced-customization*