diff --git a/bin/nvr b/bin/nvr
index 983b6b6..67a2eec 100755
--- a/bin/nvr
+++ b/bin/nvr
@@ -243,6 +243,11 @@ def main():
     if flags.l and neovim.is_attached():
         neovim.server.command('wincmd p')
 
+    try:
+        arguments.remove('--')
+    except ValueError:
+        pass
+
     # Arguments not consumed by flags, are fed to --remote.
     if arguments:
         neovim.execute(arguments, 'edit')
diff --git a/setup.py b/setup.py
index 948bbb4..b6ca687 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ setup(
     install_requires = ['neovim'],
     scripts          = ['bin/nvr'],
     packages         = [],
-    version          = '1.2.1',
+    version          = '1.2.2',
     license          = 'MIT',
     keywords         = 'neovim nvim nvr remote helper',
     classifiers      = [