diff --git a/cmd-attach-session.c b/cmd-attach-session.c
index b92a7f2b..4e2d15da 100644
--- a/cmd-attach-session.c
+++ b/cmd-attach-session.c
@@ -158,6 +158,9 @@ cmd_attach_session(struct cmdq_item *item, const char *tflag, int dflag,
 		c->flags |= CLIENT_ATTACHED;
 	}
 
+	if (cfg_finished)
+		cfg_show_causes(s);
+
 	return (CMD_RETURN_NORMAL);
 }
 
diff --git a/cmd-new-session.c b/cmd-new-session.c
index b946f049..c90369bc 100644
--- a/cmd-new-session.c
+++ b/cmd-new-session.c
@@ -333,13 +333,6 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item)
 			server_client_set_key_table(c, NULL);
 	}
 
-	/*
-	 * If there are still configuration file errors to display, put the new
-	 * session's current window into view mode and display them now.
-	 */
-	if (cfg_finished)
-		cfg_show_causes(s);
-
 	/* Print if requested. */
 	if (args_has(args, 'P')) {
 		if ((template = args_get(args, 'F')) == NULL)
@@ -357,6 +350,9 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item)
 	cmd_find_from_session(&fs, s, 0);
 	cmdq_insert_hook(s, item, &fs, "after-new-session");
 
+	if (cfg_finished)
+		cfg_show_causes(s);
+
 	if (sc.argv != NULL)
 		cmd_free_argv(sc.argc, sc.argv);
 	free(cwd);