diff --git a/i3_config b/i3_config
index d475680..e7a4449 100644
--- a/i3_config
+++ b/i3_config
@@ -182,8 +182,9 @@ for_window [class="Qmmp"] floating enable
 for_window [class="Vncviewer"] floating enable
 for_window [class="(?i)firefox" instance="^(?!Navigator$)"] floating enable
 for_window [title="^Cacti - Realtime"] floating enable
-# vimwiki to scratchpad
+# vimwiki to scratchpad (gvim included)
 for_window [instance="vimwiki"] move scratchpad, scratchpad show
+for_window [class="Gvim" title="vimwiki"] move scratchpad, scratchpad show
 bindsym $mod+n scratchpad show
 # java KVM
 for_window [instance="sun-awt-X11-XFramePeer" title="(?i)kvm"] floating enable
diff --git a/vimrc b/vimrc
index 330cc7d..13ab38a 100644
--- a/vimrc
+++ b/vimrc
@@ -11,11 +11,11 @@ set scrolloff=3 sidescrolloff=15 sidescroll=1
 set noerrorbells visualbell t_vb=
 " indentation
 set tabstop=3 softtabstop=4 shiftwidth=4 smarttab expandtab
-" status line
-set wildmenu showcmd ruler laststatus=2
-set statusline=%F\ %m%r%h%w%=%y\ [%{&ff}]\ [%4l/%L:%3v]\ [%3p%%]
 " termcap fixes
 set t_Co=256 t_ut= termencoding=utf-8 encoding=utf-8
+" status line
+set wildmenu showcmd ruler laststatus=2
+set statusline=%F\ %m%r%h%w%=%{&fenc}/%{&ff}\ %y\ [%4l/%L:%3v]\ [%3p%%]
 " enable case indentation
 let g:sh_indent_case_labels=1
 " version specific settings