diff --git a/src/freedombone-app-emacs b/src/freedombone-app-emacs
index db73be22..8447b1b8 100755
--- a/src/freedombone-app-emacs
+++ b/src/freedombone-app-emacs
@@ -188,7 +188,7 @@ function remove_emacs {
 
 function install_emacs {
     apt-get -yq install emacs ispell ibritish ifrench ispanish iitalian irussian iswedish inorwegian iirish ingerman iswiss iogerman idutch idanish ibrazilian ibulgarian ipolish iczech iestonian ilithuanian iukrainian icatalan
-    update-alternatives --set editor /usr/bin/emacs
+    update-alternatives --set editor /usr/bin/emacs24
 
     # A minimal emacs configuration
     #echo -n "(add-to-list 'load-path " > /home/$MY_USERNAME/.emacs
diff --git a/src/freedombone-app-vim b/src/freedombone-app-vim
index d1544410..0834826f 100755
--- a/src/freedombone-app-vim
+++ b/src/freedombone-app-vim
@@ -232,7 +232,7 @@ function remove_vim {
 
 function install_vim {
     apt-get -yq install vim
-    update-alternatives --set editor /usr/bin/vim
+    update-alternatives --set editor /usr/bin/vim.tiny
 
     # add a mutt entry to use Vim to compose emails
     if [ -f /etc/Muttrc ]; then