diff --git a/bin/rvim b/bin/rvim
new file mode 100755
index 0000000..d68d62d
--- /dev/null
+++ b/bin/rvim
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+sock="$(git rev-parse --show-toplevel)/nvim.sock"
+if [ -S "$sock" ]
+then
+	exec nvim --server "$sock" --remote-tab $@
+else
+	exec nvim --listen "$sock" $@
+fi
diff --git a/ranger.conf b/ranger.conf
index 1e2805c..cac8f63 100644
--- a/ranger.conf
+++ b/ranger.conf
@@ -2,9 +2,10 @@ map xh set show_hidden!
 map xv chain set vcs_aware!; reset
 map xp chain set preview_directories!; set preview_files!; set preview_images!
 
-map er open_with rvim
 map ev open_with vim
 map ex open_with xdg-open
+map eg open_with graphic
+map er open_with remote
 map ee edit
 
 map I set sort_reverse!
diff --git a/rifle.conf b/rifle.conf
index 15342b9..433b7f2 100644
--- a/rifle.conf
+++ b/rifle.conf
@@ -229,4 +229,5 @@ label view, ext md|tex = zread "$@"
 label view, has nvim, mime ^text = nvim -- "$@"
 label view, mime ^text = vim -RM -- "$@"
 
+label remote, has rvim, flag f = rvim "$@"
 label vim, has nvim = nvim -- "$@"