diff --git a/src/config/options.c b/src/config/options.c
index fe5e943b5..f1af14eb8 100644
--- a/src/config/options.c
+++ b/src/config/options.c
@@ -956,6 +956,7 @@ toggle_option(struct session *ses, struct option *option)
 
 	/* TODO: call change hooks. --jonas */
 	option->value.number = (number <= option->max) ? number : option->min;
+	option_changed(ses, option, option);
 }
 
 static int
diff --git a/src/viewer/text/search.c b/src/viewer/text/search.c
index f063e69a6..b14e098ba 100644
--- a/src/viewer/text/search.c
+++ b/src/viewer/text/search.c
@@ -1330,7 +1330,7 @@ text_typeahead_handler(struct input_line *line, int action_id)
 
 			opt->value.number = (opt->value.number + 1)
 					    % (opt->max + 1);
-			opt->flags |= OPT_TOUCHED;
+			option_changed(ses, opt, opt);
 		}
 		/* Fall thru */