diff --git a/watch/watch.plugin.zsh b/watch/watch.plugin.zsh
index 17fdcbf6807544ca94d7e133c259b26f8e488a6f..eeba2f2655f26ddbb5c5fb0549d8a40fd6ebd897 100644
--- a/watch/watch.plugin.zsh
+++ b/watch/watch.plugin.zsh
@@ -14,20 +14,6 @@
 
 watch-command-line() {
     [[ -z $BUFFER ]] && LBUFFER="$(fc -ln -1)"
-#    if [[ -n $EDITOR && $BUFFER == $EDITOR\ * ]]; then
-#        if [[ ${#LBUFFER} -le ${#EDITOR} ]]; then
-#            RBUFFER=" ${BUFFER#$EDITOR }"
-#            LBUFFER="sudoedit"
-#        else
-#            LBUFFER="sudoedit ${LBUFFER#$EDITOR }"
-#        fi
-#    elif [[ $BUFFER == sudoedit\ * ]]; then
-#        if [[ ${#LBUFFER} -le 8 ]]; then
-#            RBUFFER=" ${BUFFER#sudoedit }"
-#            LBUFFER="$EDITOR"
-#        else
-#            LBUFFER="$EDITOR ${LBUFFER#sudoedit }"
-#        fi
     if [[ $BUFFER == watch\ * ]]; then
         if [[ ${#LBUFFER} -le 4 ]]; then
             RBUFFER="${BUFFER#watch }"
@@ -39,8 +25,9 @@ watch-command-line() {
         LBUFFER="watch $LBUFFER"
     fi
 }
+
 zle -N watch-command-line
+
 # Defined shortcut keys: [Alt] [Esc]
-bindkey -M emacs '^\e' watch-command-line
-bindkey -M vicmd '^\e' watch-command-line
-bindkey -M viins '^\e' watch-command-line
+bindkey '^\e' watch-command-line
+