diff --git a/emacs/index.sh b/emacs/index.sh
index b7bfd6962..d8dbe954b 100644
--- a/emacs/index.sh
+++ b/emacs/index.sh
@@ -9,12 +9,21 @@ fi
 
 
 if [ -n "$INSIDE_EMACS" ]; then
-    export EDITOR="emacsclient"
+    export EDITOR="edit-file-in-emacs.sh"
 else
     export EDITOR=$(which vim)
 fi
 
 
+vim () {
+    if [ -n "$INSIDE_EMACS" ]; then
+        emacsclient -e "(find-file-other-window \"$1\")"
+    else
+        eval "$EDITOR \"$1\""
+    fi
+}
+
+
 man () {
     if [ -n "$INSIDE_EMACS" ]; then
         emacsclient -e  "(man \"$1\")"