diff --git a/_adb b/_adb
index ac0db72..545af41 100644
--- a/_adb
+++ b/_adb
@@ -97,6 +97,7 @@ _adb() {
           && ret=0
           case "$state" in
             (remote-command-args)
+              curcontext="${curcontext%:*:*}:adb-remote-cmd-$words[1]:"
               if (( $+functions[_adb_remote_command_$words[1]_args] )); then
                 _adb_remote_command_$words[1] && ret=0
                 # TODO Write handlers for following commands: