foo

diff --git a/options-table.c b/options-table.c
index 8d680b3..a8413df 100644
--- a/options-table.c
+++ b/options-table.c
@@ -124,17 +124,6 @@ const struct options_table_entry session_options_table[] = {
 	  .default_num = 0
 	},
 
-	{ .name = "bell-action",
-	  .type = OPTIONS_TABLE_CHOICE,
-	  .choices = options_table_bell_action_list,
-	  .default_num = BELL_ANY
-	},
-
-	{ .name = "bell-on-alert",
-	  .type = OPTIONS_TABLE_FLAG,
-	  .default_num = 0
-	},
-
 	{ .name = "default-command",
 	  .type = OPTIONS_TABLE_STRING,
 	  .default_str = ""
@@ -531,6 +520,17 @@ const struct options_table_entry window_options_table[] = {
 	                 "#{?pane_dead,[dead],}"
 	},
 
+	{ .name = "bell-action",
+	  .type = OPTIONS_TABLE_CHOICE,
+	  .choices = options_table_bell_action_list,
+	  .default_num = BELL_ANY
+	},
+
+	{ .name = "bell-on-alert",
+	  .type = OPTIONS_TABLE_FLAG,
+	  .default_num = 0
+	},
+
 	{ .name = "c0-change-trigger",
 	  .type = OPTIONS_TABLE_NUMBER,
 	  .default_num = 250,
diff --git a/server-window.c b/server-window.c
index 61be1b8..d5a31f1 100644
--- a/server-window.c
+++ b/server-window.c
@@ -75,7 +75,7 @@ server_window_check_bell(struct session *s, struct winlink *wl)
 		w->flags &= ~WINDOW_BELL;
 
 	visual = options_get_number(&s->options, "visual-bell");
-	action = options_get_number(&s->options, "bell-action");
+	action = options_get_number(&w->options, "bell-action");
 	if (action == BELL_NONE)
 		return (0);
 	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
@@ -115,7 +115,7 @@ server_window_check_activity(struct session *s, struct winlink *wl)
 	if (!options_get_number(&w->options, "monitor-activity"))
 		return (0);
 
-	if (options_get_number(&s->options, "bell-on-alert"))
+	if (options_get_number(&w->options, "bell-on-alert"))
 		ring_bell(s);
 	wl->flags |= WINLINK_ACTIVITY;