diff --git a/autoload/airline/init.vim b/autoload/airline/init.vim
index 9cb9698d..744e12f2 100644
--- a/autoload/airline/init.vim
+++ b/autoload/airline/init.vim
@@ -158,7 +158,7 @@ function! airline#init#bootstrap()
         \ 'minwidth': 100})
   call airline#parts#define('branch', {
         \ 'raw': '',
-        \ 'minwidth': 120})
+        \ 'minwidth': 80})
   call airline#parts#define_empty(['obsession', 'tagbar', 'syntastic-warn',
         \ 'syntastic-err', 'eclim', 'whitespace','windowswap',
         \ 'ycm_error_count', 'ycm_warning_count', 'neomake_error_count',
@@ -202,7 +202,7 @@ function! airline#init#sections()
     let g:airline_section_y = airline#section#create_right(['ffenc'])
   endif
   if !exists('g:airline_section_z')
-    if airline#util#winwidth() > 80
+    if airline#util#winwidth() > 79
       let g:airline_section_z = airline#section#create(['windowswap', 'obsession', '%3p%%'.spc, 'linenr', 'maxlinenr', spc.':%3v'])
     else
       let g:airline_section_z = airline#section#create(['%3p%%'.spc, 'linenr',  ':%3v'])
diff --git a/doc/airline.txt b/doc/airline.txt
index 7304471b..8104c0b7 100644
--- a/doc/airline.txt
+++ b/doc/airline.txt
@@ -438,6 +438,9 @@ If a file is edited, that is not yet in the repository, the
 notexists symbol will be displayed after the branch name. If the repository is
 not clean, the dirty symbol will be displayed after the branch name.
 
+Note: the branch extension will be disabled for windows smaller than 80
+characters.
+
 * enable/disable fugitive/lawrencium integration >
   let g:airline#extensions#branch#enabled = 1
 <