diff --git a/src/addon/manager_ui.cpp b/src/addon/manager_ui.cpp
index 2dc370bf350..36c1ed3fd38 100644
--- a/src/addon/manager_ui.cpp
+++ b/src/addon/manager_ui.cpp
@@ -469,6 +469,8 @@ sorted_addon_pointer_list sort_addons_list(addons_list& addons)
 
 void show_addons_manager_dialog(display& disp, addons_client& client, addons_list& addons, std::string& last_addon_id, bool& stay_in_ui, bool& wml_changed, addons_filter_state& filter)
 {
+	boost::scoped_ptr<cursor::setter> cursor_setter(new cursor::setter(cursor::WAIT));
+
 	stay_in_ui = false;
 	filter.changed = false;
 
@@ -534,8 +536,6 @@ void show_addons_manager_dialog(display& disp, addons_client& client, addons_lis
 	// information.
 	//
 
-	boost::scoped_ptr<cursor::setter> cursor_setter(new cursor::setter(cursor::WAIT));
-
 	const sorted_addon_pointer_list& sorted_addons = sort_addons_list(addons);
 
 	foreach(const sorted_addon_pointer_list::value_type& sorted_entry, sorted_addons) {