diff --git a/input.c b/input.c
index c33a7cce..4a9a1881 100644
--- a/input.c
+++ b/input.c
@@ -2621,7 +2621,9 @@ input_exit_apc(struct input_ctx *ictx)
 		return;
 	log_debug("%s: \"%s\"", __func__, ictx->input_buf);
 
-	if (screen_set_title(sctx->s, ictx->input_buf) && wp != NULL) {
+	if (wp != NULL &&
+	    options_get_number(wp->options, "allow-set-title") &&
+	    screen_set_title(sctx->s, ictx->input_buf)) {
 		notify_pane("pane-title-changed", wp);
 		server_redraw_window_borders(wp->window);
 		server_status_window(wp->window);
diff --git a/tty.c b/tty.c
index c3225bcd..ac28cd60 100644
--- a/tty.c
+++ b/tty.c
@@ -407,8 +407,8 @@ void
 tty_repeat_requests(struct tty *tty, int force)
 {
 	struct client	*c = tty->client;
-	time_t	t = time(NULL);
-	u_int	n = t - tty->last_requests;
+	time_t		 t = time(NULL);
+	u_int		 n = t - tty->last_requests;
 
 	if (~tty->flags & TTY_STARTED)
 		return;