diff --git a/lib/keychain.c b/lib/keychain.c
index 251211734b..82fd6a65f2 100644
--- a/lib/keychain.c
+++ b/lib/keychain.c
@@ -1041,6 +1041,8 @@ static int keychain_config_write(struct vty *vty)
 				}
 				vty_out(vty, "\n");
 			}
+
+			vty_out(vty, " exit\n");
 		}
 		vty_out(vty, "!\n");
 	}
diff --git a/tools/frr-reload.py b/tools/frr-reload.py
index a72e5c2772..8ffc313c04 100755
--- a/tools/frr-reload.py
+++ b/tools/frr-reload.py
@@ -591,6 +591,7 @@ end
                   line.startswith("vnc l2-group") or
                   line.startswith("vnc nve-group") or
                   line.startswith("peer") or
+                  line.startswith("key ") or
                   line.startswith("member pseudowire")):
                 main_ctx_key = []