diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index c92c6c4..9729d2e 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -1040,6 +1040,8 @@
     case RMAP_NODE:
     case VTY_NODE:
     case KEYCHAIN_NODE:
+      vtysh_execute("end");
+      vtysh_execute("configure terminal");
       vty->node = CONFIG_NODE;
       break;
     case BGP_VPNV4_NODE: