diff --git a/src/gui/dialogs/addon/manager.cpp b/src/gui/dialogs/addon/manager.cpp
index 41809bd623c8..04304f628a96 100644
--- a/src/gui/dialogs/addon/manager.cpp
+++ b/src/gui/dialogs/addon/manager.cpp
@@ -312,10 +312,6 @@ void addon_manager::pre_show(window& window)
 	text_box& filter = find_widget<text_box>(&window, "filter", false);
 	filter.set_text_changed_callback(std::bind(&addon_manager::on_filtertext_changed, this, _1));
 
-#ifdef GUI2_EXPERIMENTAL_LISTBOX
-	connect_signal_notify_modified(list,
-		std::bind(&addon_manager::on_addon_select, *this, std::ref(window)));
-#else
 	list.set_install_function(std::bind(&addon_manager::install_addon,
 		this, std::placeholders::_1, std::ref(window)));
 	list.set_uninstall_function(std::bind(&addon_manager::uninstall_addon,
@@ -328,9 +324,7 @@ void addon_manager::pre_show(window& window)
 	list.set_delete_function(std::bind(&addon_manager::delete_addon,
 		this, std::placeholders::_1, std::ref(window)));
 
-	list.set_callback_value_change(
-		dialog_callback<addon_manager, &addon_manager::on_addon_select>);
-#endif
+	list.set_modified_signal_handler([this, &window]() { on_addon_select(window); });
 
 	fetch_addons_list(window);
 	load_addon_list(window);
diff --git a/src/gui/dialogs/core_selection.cpp b/src/gui/dialogs/core_selection.cpp
index 08369ca99345..fa239c2e617b 100644
--- a/src/gui/dialogs/core_selection.cpp
+++ b/src/gui/dialogs/core_selection.cpp
@@ -88,17 +88,9 @@ void core_selection::pre_show(window& window)
 {
 	/***** Setup core list. *****/
 	listbox& list = find_widget<listbox>(&window, "core_list", false);
-#ifdef GUI2_EXPERIMENTAL_LISTBOX
-	connect_signal_notify_modified(
-			list,
-			std::bind(&core_selection::core_selected,
-						this,
-						std::ref(window)));
-#else
-	list.set_callback_value_change(
-			dialog_callback<core_selection,
-							&core_selection::core_selected>);
-#endif
+
+	connect_signal_notify_modified(list, std::bind(&core_selection::core_selected, this, std::ref(window)));
+
 	window.keyboard_capture(&list);
 
 	/***** Setup core details. *****/
diff --git a/src/gui/dialogs/drop_down_menu.cpp b/src/gui/dialogs/drop_down_menu.cpp
index 937d220324c8..55154417d00c 100644
--- a/src/gui/dialogs/drop_down_menu.cpp
+++ b/src/gui/dialogs/drop_down_menu.cpp
@@ -177,7 +177,7 @@ void drop_down_menu::pre_show(window& window)
 	// Handle embedded button toggling.
 	// For some reason this works as a listbox value callback but don't ask me why.
 	// -vultraz 2/17/17
-	list.set_callback_value_change(std::bind(&callback_flip_embedded_toggle, std::ref(window)));
+	connect_signal_notify_modified(list, std::bind(&callback_flip_embedded_toggle, std::ref(window)));
 
 	// Dismiss on resize
 	window.connect_signal<event::SDL_VIDEO_RESIZE>(std::bind(&resize_callback, std::ref(window)), event::dispatcher::front_child);
diff --git a/src/gui/dialogs/editor/generate_map.cpp b/src/gui/dialogs/editor/generate_map.cpp
index 45817744a614..6d96abea2122 100644
--- a/src/gui/dialogs/editor/generate_map.cpp
+++ b/src/gui/dialogs/editor/generate_map.cpp
@@ -134,8 +134,8 @@ void editor_generate_map::pre_show(window& window)
 		this->do_generator_selected(window);
 	}
 
-	list.set_callback_item_change(
-			std::bind(&editor_generate_map::do_generator_selected, this, std::ref(window)));
+	connect_signal_notify_modified(list,
+		std::bind(&editor_generate_map::do_generator_selected, this, std::ref(window)));
 
 	button& settings_button = find_widget<button>(&window, "settings", false);
 	connect_signal_mouse_left_click(
diff --git a/src/gui/dialogs/file_dialog.cpp b/src/gui/dialogs/file_dialog.cpp
index d219092d3cf8..0493ee393358 100644
--- a/src/gui/dialogs/file_dialog.cpp
+++ b/src/gui/dialogs/file_dialog.cpp
@@ -231,21 +231,10 @@ void file_dialog::pre_show(window& window)
 
 	listbox& filelist = find_widget<listbox>(&window, "filelist", false);
 
-#ifdef GUI2_EXPERIMENTAL_LISTBOX
-	connect_signal_notify_modified(filelist, std::bind(
-				  &file_dialog::on_row_selected
-				, *this
-				, std::ref(window)));
-	connect_signal_notify_modified(bookmarks_bar, std::begin(
-				  &file_dialog::on_bookmark_selected
-				, *this
-				, std::ref(window)));
-#else
-	filelist.set_callback_value_change(
-			dialog_callback<file_dialog, &file_dialog::on_row_selected>);
-	bookmarks_bar.set_callback_value_change(
-			dialog_callback<file_dialog, &file_dialog::on_bookmark_selected>);
-#endif
+	connect_signal_notify_modified(filelist,
+			std::bind(&file_dialog::on_row_selected, this, std::ref(window)));
+	connect_signal_notify_modified(bookmarks_bar,
+			std::bind(&file_dialog::on_bookmark_selected, this, std::ref(window)));
 
 	button& mkdir_button = find_widget<button>(&window, "new_dir", false);
 	button& rm_button = find_widget<button>(&window, "delete_file", false);
diff --git a/src/gui/dialogs/game_load.cpp b/src/gui/dialogs/game_load.cpp
index 2e3752fd401a..5196bf7e35c5 100644
--- a/src/gui/dialogs/game_load.cpp
+++ b/src/gui/dialogs/game_load.cpp
@@ -117,13 +117,8 @@ void game_load::pre_show(window& window)
 
 	listbox& list = find_widget<listbox>(&window, "savegame_list", false);
 
-#ifdef GUI2_EXPERIMENTAL_LISTBOX
 	connect_signal_notify_modified(list,
-			std::bind(&game_load::display_savegame, *this, std::ref(window)));
-#else
-	list.set_callback_value_change(
-			dialog_callback<game_load, &game_load::display_savegame>);
-#endif
+			std::bind(&game_load::display_savegame, this, std::ref(window)));
 
 	window.keyboard_capture(filter);
 	window.add_to_keyboard_chain(&list);
diff --git a/src/gui/dialogs/game_stats.cpp b/src/gui/dialogs/game_stats.cpp
index 6f917c70c2a7..8cfea5eac40a 100644
--- a/src/gui/dialogs/game_stats.cpp
+++ b/src/gui/dialogs/game_stats.cpp
@@ -238,14 +238,7 @@ void game_stats::pre_show(window& window)
 
 	window.keyboard_capture(&tab_bar);
 
-#ifdef GUI2_EXPERIMENTAL_LISTBOX
-	connect_signal_notify_modified(*tab_bar,
-			std::bind(&game_stats::on_tab_select,
-				*this, std::ref(window)));
-#else
-	tab_bar.set_callback_value_change(
-			dialog_callback<game_stats, &game_stats::on_tab_select>);
-#endif
+	connect_signal_notify_modified(tab_bar, std::bind(&game_stats::on_tab_select, this, std::ref(window)));
 
 	on_tab_select(window);
 }
diff --git a/src/gui/dialogs/game_version.cpp b/src/gui/dialogs/game_version.cpp
index a22f1a8ca2f0..a1b45eaf1d8f 100644
--- a/src/gui/dialogs/game_version.cpp
+++ b/src/gui/dialogs/game_version.cpp
@@ -274,13 +274,8 @@ void game_version::pre_show(window& window)
 	const unsigned tab_count = tab_bar.get_item_count();
 	VALIDATE(tab_count == pager.get_layer_count(), "Tab bar and container size mismatch");
 
-#ifdef GUI2_EXPERIMENTAL_LISTBOX
 	connect_signal_notify_modified(tab_bar,
-		std::bind(&game_version::tab_switch_callback, *this, std::ref(window)));
-#else
-	tab_bar.set_callback_value_change(
-		dialog_callback<game_version, &game_version::tab_switch_callback>);
-#endif
+		std::bind(&game_version::tab_switch_callback, this, std::ref(window)));
 }
 
 void game_version::tab_switch_callback(window& window)
diff --git a/src/gui/dialogs/lobby/lobby.cpp b/src/gui/dialogs/lobby/lobby.cpp
index fbd50e7eb54e..3b60ca946c30 100644
--- a/src/gui/dialogs/lobby/lobby.cpp
+++ b/src/gui/dialogs/lobby/lobby.cpp
@@ -672,14 +672,9 @@ void mp_lobby::pre_show(window& window)
 	SCOPE_LB;
 
 	gamelistbox_ = find_widget<listbox>(&window, "game_list", false, true);
-#ifdef GUI2_EXPERIMENTAL_LISTBOX
-	connect_signal_notify_modified(
-			*gamelistbox_,
-			std::bind(&mp_lobby::gamelist_change_callback, *this, std::ref(window)));
-#else
-	gamelistbox_->set_callback_value_change(
-			dialog_callback<mp_lobby, &mp_lobby::gamelist_change_callback>);
-#endif
+
+	connect_signal_notify_modified(*gamelistbox_,
+			std::bind(&mp_lobby::gamelist_change_callback, this, std::ref(window)));
 
 	window.keyboard_capture(gamelistbox_);
 
diff --git a/src/gui/dialogs/multiplayer/faction_select.cpp b/src/gui/dialogs/multiplayer/faction_select.cpp
index f54c19fbc4e2..fa524862e337 100644
--- a/src/gui/dialogs/multiplayer/faction_select.cpp
+++ b/src/gui/dialogs/multiplayer/faction_select.cpp
@@ -84,14 +84,8 @@ void faction_select::pre_show(window& window)
 
 	window.keyboard_capture(&list);
 
-#ifdef GUI2_EXPERIMENTAL_LISTBOX
-	connect_signal_notify_modified(*list,
-	   std::bind(&faction_select::on_faction_select,
-			*this, std::ref(window)));
-#else
-	list.set_callback_value_change(
-		dialog_callback<faction_select, &faction_select::on_faction_select>);
-#endif
+	connect_signal_notify_modified(list,
+		std::bind(&faction_select::on_faction_select, this, std::ref(window)));
 
 	for(const config *s : flg_manager_.choosable_factions()) {
 		const config& side = *s;
diff --git a/src/gui/dialogs/multiplayer/mp_change_control.cpp b/src/gui/dialogs/multiplayer/mp_change_control.cpp
index 100da0318c03..8b43fc149ea9 100644
--- a/src/gui/dialogs/multiplayer/mp_change_control.cpp
+++ b/src/gui/dialogs/multiplayer/mp_change_control.cpp
@@ -86,19 +86,11 @@ void mp_change_control::pre_show(window& window)
 	listbox& sides_list = find_widget<listbox>(&window, "sides_list", false);
 	listbox& nicks_list = find_widget<listbox>(&window, "nicks_list", false);
 
-#ifdef GUI2_EXPERIMENTAL_LISTBOX
 	connect_signal_notify_modified(sides_list,
 		std::bind(&mp_change_control::handle_sides_list_item_clicked, this, std::ref(window)));
 
 	connect_signal_notify_modified(nicks_list,
 		std::bind(&mp_change_control::handle_nicks_list_item_clicked, this, std::ref(window)));
-#else
-	sides_list.set_callback_value_change(
-		dialog_callback<mp_change_control, &mp_change_control::handle_sides_list_item_clicked>);
-
-	nicks_list.set_callback_value_change(
-		dialog_callback<mp_change_control, &mp_change_control::handle_nicks_list_item_clicked>);
-#endif
 
 	//
 	// Initialize sides list
diff --git a/src/gui/dialogs/multiplayer/mp_create_game.cpp b/src/gui/dialogs/multiplayer/mp_create_game.cpp
index ce41434bd641..a6b907d433bd 100644
--- a/src/gui/dialogs/multiplayer/mp_create_game.cpp
+++ b/src/gui/dialogs/multiplayer/mp_create_game.cpp
@@ -250,14 +250,7 @@ void mp_create_game::pre_show(window& win)
 		mog_toggle.set_callback_state_change(std::bind(&mp_create_game::on_mod_toggle, this, i));
 	}
 
-#ifdef GUI2_EXPERIMENTAL_LISTBOX
-	connect_signal_notify_modified(*mod_list,
-			std::bind(&mp_create_game::on_mod_select,
-				*this, std::ref(win)));
-#else
-	mod_list.set_callback_value_change(
-			dialog_callback<mp_create_game, &mp_create_game::on_mod_select>);
-#endif
+	connect_signal_notify_modified(mod_list, std::bind(&mp_create_game::on_mod_select, this, std::ref(win)));
 
 	// No mods, hide the header
 	if(mod_list.get_item_count() <= 0) {
@@ -308,14 +301,8 @@ void mp_create_game::pre_show(window& win)
 	//
 	listbox& tab_bar = find_widget<listbox>(&win, "tab_bar", false);
 
-#ifdef GUI2_EXPERIMENTAL_LISTBOX
-	connect_signal_notify_modified(*tab_bar,
-			std::bind(&mp_create_game::on_tab_select,
-				*this, std::ref(win)));
-#else
-	tab_bar.set_callback_value_change(
-			dialog_callback<mp_create_game, &mp_create_game::on_tab_select>);
-#endif
+	connect_signal_notify_modified(tab_bar,
+		std::bind(&mp_create_game::on_tab_select, this, std::ref(win)));
 
 	// We call on_tab_select farther down.
 
@@ -324,14 +311,8 @@ void mp_create_game::pre_show(window& win)
 	//
 	listbox& list = find_widget<listbox>(&win, "games_list", false);
 
-#ifdef GUI2_EXPERIMENTAL_LISTBOX
 	connect_signal_notify_modified(list,
-		std::bind(&mp_create_game::on_game_select,
-			*this, std::ref(win)));
-#else
-	list.set_callback_value_change(
-			dialog_callback<mp_create_game, &mp_create_game::on_game_select>);
-#endif
+		std::bind(&mp_create_game::on_game_select, this, std::ref(win)));
 
 	win.add_to_keyboard_chain(&list);
 
diff --git a/src/gui/dialogs/preferences_dialog.cpp b/src/gui/dialogs/preferences_dialog.cpp
index cc06b5c7abc9..ac194634fc24 100644
--- a/src/gui/dialogs/preferences_dialog.cpp
+++ b/src/gui/dialogs/preferences_dialog.cpp
@@ -527,7 +527,7 @@ void preferences_dialog::post_build(window& window)
 			std::ref(textbox),
 			std::ref(window)));
 
-	friends_list.set_callback_value_change(std::bind(
+	connect_signal_notify_modified(friends_list, std::bind(
 			&preferences_dialog::on_friends_list_select,
 			this,
 			std::ref(friends_list),
@@ -676,17 +676,11 @@ void preferences_dialog::post_build(window& window)
 		}
 	}
 
-#ifdef GUI2_EXPERIMENTAL_LISTBOX
 	connect_signal_notify_modified(advanced, std::bind(
 		&preferences_dialog::on_advanced_prefs_list_select,
 		this,
 		std::ref(advanced),
 		std::ref(window)));
-#else
-	advanced.set_callback_value_change([&, this](widget&) {
-		on_advanced_prefs_list_select(advanced, window);
-	});
-#endif
 
 	on_advanced_prefs_list_select(advanced, window);
 
@@ -932,21 +926,13 @@ void preferences_dialog::on_advanced_prefs_list_select(listbox& list, window& wi
 	}
 }
 
-void preferences_dialog::initialize_tabs(window& /*window*/, listbox& selector)
+void preferences_dialog::initialize_tabs(window& window, listbox& selector)
 {
 	//
 	// MULTIPLAYER TABS
 	//
-
-#ifdef GUI2_EXPERIMENTAL_LISTBOX
-	connect_signal_notify_modified(selector, std::bind(
-			&preferences_dialog::on_tab_select,
-			this,
-			std::ref(window)));
-#else
-	selector.set_callback_value_change(dialog_callback
-			<preferences_dialog, &preferences_dialog::on_tab_select>);
-#endif
+	connect_signal_notify_modified(selector,
+		std::bind(&preferences_dialog::on_tab_select, this, std::ref(window)));
 }
 
 static int index_in_pager_range(const int& first, const stacked_widget& pager)
@@ -979,15 +965,9 @@ void preferences_dialog::pre_show(window& window)
 	listbox& selector = find_widget<listbox>(&window, "selector", false);
 	stacked_widget& pager = find_widget<stacked_widget>(&window, "pager", false);
 
-#ifdef GUI2_EXPERIMENTAL_LISTBOX
-	connect_signal_notify_modified(selector, std::bind(
-			&preferences_dialog::on_page_select,
-			this,
-			std::ref(window)));
-#else
-	selector.set_callback_value_change(dialog_callback
-			<preferences_dialog, &preferences_dialog::on_page_select>);
-#endif
+	connect_signal_notify_modified(selector,
+		std::bind(&preferences_dialog::on_page_select, this, std::ref(window)));
+
 	window.keyboard_capture(&selector);
 
 	VALIDATE(selector.get_item_count() == pager.get_layer_count(),
diff --git a/src/gui/dialogs/statistics_dialog.cpp b/src/gui/dialogs/statistics_dialog.cpp
index 68bf0d8615b6..40793d93c458 100644
--- a/src/gui/dialogs/statistics_dialog.cpp
+++ b/src/gui/dialogs/statistics_dialog.cpp
@@ -81,26 +81,16 @@ void statistics_dialog::pre_show(window& window)
 	listbox& tab_bar = find_widget<listbox>(&window, "tab_bar", false);
 	tab_bar.select_row(use_campaign);
 
-#ifdef GUI2_EXPERIMENTAL_LISTBOX
-	connect_signal_notify_modified(*tab_bar,
-		std::bind(&statistics_dialog::on_tab_select, *this, std::ref(window)));
-#else
-	tab_bar.set_callback_value_change(
-		dialog_callback<statistics_dialog, &statistics_dialog::on_tab_select>);
-#endif
+	connect_signal_notify_modified(tab_bar,
+		std::bind(&statistics_dialog::on_tab_select, this, std::ref(window)));
 
 	//
 	// Set up primary stats list
 	//
 	listbox& stat_list = find_widget<listbox>(&window, "stats_list_main", false);
 
-#ifdef GUI2_EXPERIMENTAL_LISTBOX
-	connect_signal_notify_modified(*stat_list,
-		std::bind(&statistics_dialog::on_primary_list_select, *this, std::ref(window)));
-#else
-	stat_list.set_callback_value_change(
-		dialog_callback<statistics_dialog, &statistics_dialog::on_primary_list_select>);
-#endif
+	connect_signal_notify_modified(stat_list,
+		std::bind(&statistics_dialog::on_primary_list_select, this, std::ref(window)));
 
 	update_lists(window);
 }
diff --git a/src/gui/dialogs/unit_advance.cpp b/src/gui/dialogs/unit_advance.cpp
index c2e9a974efa8..f9e366ed22de 100644
--- a/src/gui/dialogs/unit_advance.cpp
+++ b/src/gui/dialogs/unit_advance.cpp
@@ -51,15 +51,7 @@ void unit_advance::pre_show(window& window)
 {
 	listbox& list = find_widget<listbox>(&window, "advance_choice", false);
 
-#ifdef GUI2_EXPERIMENTAL_LISTBOX
-	connect_signal_notify_modified(*list,
-		std::bind(&unit_advance::list_item_clicked,
-		*this,
-		std::ref(window)));
-#else
-	list.set_callback_value_change(
-		dialog_callback<unit_advance, &unit_advance::list_item_clicked>);
-#endif
+	connect_signal_notify_modified(list, std::bind(&unit_advance::list_item_clicked, this, std::ref(window)));
 
 	window.keyboard_capture(&list);
 
diff --git a/src/gui/dialogs/unit_create.cpp b/src/gui/dialogs/unit_create.cpp
index d0928733ae52..6b60497d4e58 100644
--- a/src/gui/dialogs/unit_create.cpp
+++ b/src/gui/dialogs/unit_create.cpp
@@ -115,15 +115,7 @@ void unit_create::pre_show(window& window)
 	window.keyboard_capture(filter);
 	window.add_to_keyboard_chain(&list);
 
-#ifdef GUI2_EXPERIMENTAL_LISTBOX
-	connect_signal_notify_modified(*list,
-								   std::bind(&unit_create::list_item_clicked,
-											   *this,
-											   std::ref(window)));
-#else
-	list.set_callback_value_change(
-			dialog_callback<unit_create, &unit_create::list_item_clicked>);
-#endif
+	connect_signal_notify_modified(list, std::bind(&unit_create::list_item_clicked, this, std::ref(window)));
 
 	list.clear();
 
diff --git a/src/gui/dialogs/unit_list.cpp b/src/gui/dialogs/unit_list.cpp
index 346c922449f7..9041847d02a0 100644
--- a/src/gui/dialogs/unit_list.cpp
+++ b/src/gui/dialogs/unit_list.cpp
@@ -100,14 +100,7 @@ void unit_list::pre_show(window& window)
 {
 	listbox& list = find_widget<listbox>(&window, "units_list", false);
 
-#ifdef GUI2_EXPERIMENTAL_LISTBOX
-	connect_signal_notify_modified(*list,
-			std::bind(&unit_list::list_item_clicked,
-				*this, std::ref(window)));
-#else
-	list.set_callback_value_change(
-			dialog_callback<unit_list, &unit_list::list_item_clicked>);
-#endif
+	connect_signal_notify_modified(list, std::bind(&unit_list::list_item_clicked, this, std::ref(window)));
 
 	list.clear();
 
diff --git a/src/gui/dialogs/unit_recall.cpp b/src/gui/dialogs/unit_recall.cpp
index 203a150f636a..785f9ebaabb5 100644
--- a/src/gui/dialogs/unit_recall.cpp
+++ b/src/gui/dialogs/unit_recall.cpp
@@ -167,14 +167,7 @@ void unit_recall::pre_show(window& window)
 
 	listbox& list = find_widget<listbox>(&window, "recall_list", false);
 
-#ifdef GUI2_EXPERIMENTAL_LISTBOX
-	connect_signal_notify_modified(*list,
-			std::bind(&unit_recall::list_item_clicked,
-				*this, std::ref(window)));
-#else
-	list.set_callback_value_change(
-			dialog_callback<unit_recall, &unit_recall::list_item_clicked>);
-#endif
+	connect_signal_notify_modified(list, std::bind(&unit_recall::list_item_clicked, this, std::ref(window)));
 
 	list.clear();
 
diff --git a/src/gui/dialogs/unit_recruit.cpp b/src/gui/dialogs/unit_recruit.cpp
index 8e9795c4e251..18c304467b99 100644
--- a/src/gui/dialogs/unit_recruit.cpp
+++ b/src/gui/dialogs/unit_recruit.cpp
@@ -64,15 +64,7 @@ void unit_recruit::pre_show(window& window)
 {
 	listbox& list = find_widget<listbox>(&window, "recruit_list", false);
 
-#ifdef GUI2_EXPERIMENTAL_LISTBOX
-	connect_signal_notify_modified(*list,
-		std::bind(&unit_recruit::list_item_clicked,
-		*this,
-		std::ref(window)));
-#else
-	list.set_callback_value_change(
-		dialog_callback<unit_recruit, &unit_recruit::list_item_clicked>);
-#endif
+	connect_signal_notify_modified(list, std::bind(&unit_recruit::list_item_clicked, this, std::ref(window)));
 
 	window.keyboard_capture(&list);
 
diff --git a/src/gui/widgets/addon_list.hpp b/src/gui/widgets/addon_list.hpp
index f222934f4d0c..d93b01fcdcba 100644
--- a/src/gui/widgets/addon_list.hpp
+++ b/src/gui/widgets/addon_list.hpp
@@ -47,9 +47,9 @@ class addon_list : public container_base
 	void set_addons(const addons_list& addons);
 
 	/** Sets up a callback that will be called when the player selects an add-on. */
-	void set_callback_value_change(const std::function<void(widget&)>& callback)
+	void set_modified_signal_handler(const std::function<void()>& callback)
 	{
-		get_listbox().set_callback_value_change(callback);
+		connect_signal_notify_modified(get_listbox(), std::bind(callback));
 	}
 
 	/** Returns the selected add-on. */
diff --git a/src/gui/widgets/chatbox.cpp b/src/gui/widgets/chatbox.cpp
index 0a324d52b72b..f1be2575aca2 100644
--- a/src/gui/widgets/chatbox.cpp
+++ b/src/gui/widgets/chatbox.cpp
@@ -100,9 +100,9 @@ void chatbox::finalize_setup()
 {
 	roomlistbox_ = find_widget<listbox>(this, "room_list", false, true);
 
-	roomlistbox_->set_callback_value_change([this](widget&) {
-		switch_to_window(roomlistbox_->get_selected_row());
-	});
+	// We need to bind a lambda here since switch_to_window is overloaded.
+	connect_signal_notify_modified(*roomlistbox_,
+		std::bind([this]() { switch_to_window(roomlistbox_->get_selected_row()); }));
 
 	chat_log_container_ = find_widget<multi_page>(this, "chat_log_container", false, true);
 
diff --git a/src/scripting/lua_gui2.cpp b/src/scripting/lua_gui2.cpp
index eb7b7fbe6793..6e0a412f4614 100644
--- a/src/scripting/lua_gui2.cpp
+++ b/src/scripting/lua_gui2.cpp
@@ -793,7 +793,8 @@ int intf_set_dialog_callback(lua_State* L)
 	}
 #else
 	else if(gui2::listbox* l = dynamic_cast<gui2::listbox*>(w)) {
-		l->set_callback_value_change(&dialog_callback);
+		static dialog_callback_wrapper wrapper;
+		connect_signal_notify_modified(*l, std::bind(&dialog_callback_wrapper::forward, wrapper, w));
 	}
 #endif
 	else if(gui2::tree_view* tv = dynamic_cast<gui2::tree_view*>(w)) {