2 files changed, 4 insertions, 1 deletions
diff --git a/main.c b/main.c
index 308f7fb5..f7c15494 100644
--- a/main.c
+++ b/main.c
@@ -1184,7 +1184,7 @@ spawn_pager(struct tag_files *tag_files)
 	if (dup2(tag_files->ofd, STDOUT_FILENO) == -1)
 		err((int)MANDOCLEVEL_SYSERR, "pager stdout");
 	close(tag_files->ofd);
-	close(tag_files->tfd);
+	assert(tag_files->tfd == -1);
 
 	/* Do not start the pager before controlling the terminal. */
 
diff --git a/tag.c b/tag.c
index b57df552..5862db63 100644
--- a/tag.c
+++ b/tag.c
@@ -213,6 +213,9 @@ tag_write(void)
 	ohash_delete(&tag_data);
 	if (stream != NULL)
 		fclose(stream);
+	else
+		close(tag_files.tfd);
+	tag_files.tfd = -1;
 }
 
 void