3 files changed, 8 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 49e0a6608000..aa39206adda7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Wed Mar 16 19:33:32 UTC 2016
 pkgbase = neovim-gnome-terminal-wrapper
 	pkgdesc = A wrapper for running neovim in a separate instance of gnome-terminal
 	pkgver = 2
-	pkgrel = 4
+	pkgrel = 5
 	url = http://github.com/fmoralesc/
 	arch = any
 	license = GPL
diff --git a/PKGBUILD b/PKGBUILD
index fe539c4ddcc8..55500c0499ec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Felipe Morales <hel.sheep@gmail.com>
 pkgname=neovim-gnome-terminal-wrapper
 pkgver=2
-pkgrel=4
+pkgrel=5
 pkgdesc="A wrapper for running neovim in a separate instance of gnome-terminal"
 arch=(any)
 url="http://github.com/fmoralesc/"
diff --git a/nvim-wrapper b/nvim-wrapper
index 327803f25a3b..36fe69c6c3fb 100755
--- a/nvim-wrapper
+++ b/nvim-wrapper
@@ -58,6 +58,10 @@ def processArgv():
         else:
             nvimOptions.append(arg)
 
+    # launch the wrapper in the current directory by default
+    if not any([o.startswith('--working-directory') for o in gtermOptions]):
+        gtermOptions.append('--working-directory='+os.path.abspath(os.curdir))
+
     return {
         'gterm': gtermOptions,
         'nvim': nvimOptions