diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc
index a0e6384b23..1707ac8154 100644
--- a/gtk2_ardour/ardour_ui_options.cc
+++ b/gtk2_ardour/ardour_ui_options.cc
@@ -394,6 +394,13 @@ ARDOUR_UI::parameter_changed (std::string p)
 			stop_clocking ();
 			start_clocking ();
 		}
+	} else if (p == "use-tooltips") {
+		/* this doesn't really belong here but it has to go somewhere */
+		if (UIConfiguration::instance().get_use_tooltips()) {
+			Gtkmm2ext::enable_tooltips ();
+		} else {
+			Gtkmm2ext::disable_tooltips ();
+		}
 	} else if (p == "waveform-gradient-depth") {
 		ArdourCanvas::WaveView::set_global_gradient_depth (UIConfiguration::instance().get_waveform_gradient_depth());
 	} else if (p == "show-editor-meter") {
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index 85719043a3..3c26390aa6 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -1719,15 +1719,6 @@ Editor::parameter_changed (std::string p)
 		if (_routes) {
 			_routes->reset_remote_control_ids ();
 		}
-	} else if (p == "use-tooltips") {
-
-		/* this doesn't really belong here but it has to go somewhere */
-
-		if (UIConfiguration::instance().get_use_tooltips()) {
-			Gtkmm2ext::enable_tooltips ();
-		} else {
-			Gtkmm2ext::disable_tooltips ();
-		}
 	} else if (p == "skip-playback") {
 		Glib::RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("toggle-skip-playback"));