diff --git a/vtysh/ChangeLog b/vtysh/ChangeLog
index 8e2875b..8e55786 100644
--- a/vtysh/ChangeLog
+++ b/vtysh/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-10 Hasso Tepper <hasso@estpak.ee>
+
+	* vtysh.c: Workaround for most hated vtysh bug - Bugzilla #58.
+
 2004-04-06 Hasso Tepper <hasso@estpak.ee>
 
 	* vtysh_main.c: Don't save command to history if last command already
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: