diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 63d44499b1..89d7a812fd 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -469,7 +469,7 @@ Editor::Editor ()
 	, _stepping_axis_view (0)
 	, quantize_dialog (0)
 	, _main_menu_disabler (0)
-	, _tempo_edit_behavior (UIConfiguration::instance().get_default_tempo_edit_behavior())
+	, _tempo_edit_behavior (UIConfiguration::instance().get_tempo_edit_behavior())
 {
 	/* we are a singleton */
 
@@ -6754,6 +6754,8 @@ Editor::ui_parameter_changed (string parameter)
 		_track_canvas->request_redraw (_track_canvas->visible_area());
 	} else if (parameter == "use-note-color-for-velocity") {
 		/* handled individually by each MidiRegionView */
+	} else if (parameter == "tempo-edit-behavior") {
+		set_tempo_edit_behavior (UIConfiguration::instance().get_tempo_edit_behavior());
 	}
 }
 
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index c471a37c7e..873484cd29 100644
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -191,7 +191,7 @@ Editor::initialize_canvas ()
 	mapping_bar->set_outline(false);
 	mapping_bar->set_outline_what(ArdourCanvas::Rectangle::BOTTOM);
 
-	switch (UIConfiguration::instance().get_default_tempo_edit_behavior()) {
+	switch (UIConfiguration::instance().get_tempo_edit_behavior()) {
 	case Editing::TempoMapping:
 		tempo_group->hide ();
 		break;
diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index b8887fc114..2868fd4835 100644
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -4501,8 +4501,8 @@ These settings will only take effect after %1 is restarted.\n\
 	ComboOption<Editing::TempoEditBehavior>* teb = new ComboOption<Editing::TempoEditBehavior> (
 		"default-tempo-edit-behavior",
 		_("Default tempo ruler state for new sessions"),
-		sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_default_tempo_edit_behavior),
-		sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_default_tempo_edit_behavior));
+		sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_tempo_edit_behavior),
+		sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_tempo_edit_behavior));
 	teb->add (Editing::TempoMapping, _("mapping a recorded performance"));
 	teb->add (Editing::TempoChanging, _("constructing a tempo map from scratch"));
 
diff --git a/gtk2_ardour/ui_config_vars.h b/gtk2_ardour/ui_config_vars.h
index 7225f28ed6..0f3494108c 100644
--- a/gtk2_ardour/ui_config_vars.h
+++ b/gtk2_ardour/ui_config_vars.h
@@ -149,9 +149,9 @@ UI_CONFIG_VARIABLE (bool, ask_before_closing_last_window, "ask-before-closing-la
 UI_CONFIG_VARIABLE (std::string, freesound_dir, "freesound-dir", "")
 UI_CONFIG_VARIABLE (int, max_note_height, "max-note-height", 20)
 #ifdef MIXBUS
-UI_CONFIG_VARIABLE (Editing::TempoEditBehavior, default_tempo_edit_behavior, "default-tempo-edit-behavior", Editing::TempoMapping)
+UI_CONFIG_VARIABLE (Editing::TempoEditBehavior, tempo_edit_behavior, "tempo-edit-behavior", Editing::TempoMapping)
 #else
-UI_CONFIG_VARIABLE (Editing::TempoEditBehavior, default_tempo_edit_behavior, "default-tempo-edit-behavior", Editing::TempoChanging)
+UI_CONFIG_VARIABLE (Editing::TempoEditBehavior, tempo_edit_behavior, "tempo-edit-behavior", Editing::TempoChanging)
 #endif
 
 /* these are visibility-type selections in the New Track dialog that we should make persistent for the user's choices */