diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 8ed63e398c..25b40037ba 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -483,7 +483,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
 
 	/* lets get this party started */
 
-	setup_gtk_ardour_enums ();
 	setup_profile ();
 
 	SessionEvent::create_per_thread_pool ("GUI", 4096);
diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc
index 66923f875a..332944d72b 100644
--- a/gtk2_ardour/editor_canvas_events.cc
+++ b/gtk2_ardour/editor_canvas_events.cc
@@ -208,6 +208,8 @@ Editor::typed_event (ArdourCanvas::Item* item, GdkEvent *event, ItemType type)
 		return false;
 	}
 
+	std::cerr << "event for " << enum_2_string (type) << ' ' << item->whoami() << std::endl;
+
 	gint ret = FALSE;
 
 	switch (event->type) {
diff --git a/gtk2_ardour/enums.cc b/gtk2_ardour/enums.cc
index f2e2b4bdfc..f4f79ce5db 100644
--- a/gtk2_ardour/enums.cc
+++ b/gtk2_ardour/enums.cc
@@ -229,7 +229,7 @@ setup_gtk_ardour_enums ()
 	REGISTER_CLASS_ENUM (AddRouteDialog, FoldbackBus);
 	REGISTER (type_wanted);
 
-	REGISTER_ENUM (TempoMapping);
-	REGISTER_ENUM (TempoChanging);
+	REGISTER_CLASS_ENUM (Editing, TempoMapping);
+	REGISTER_CLASS_ENUM (Editing, TempoChanging);
 	REGISTER (tempo_edit_behavior);
 }
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index e3a76b45be..d585b834c0 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -450,6 +450,8 @@ int main (int argc, char *argv[])
 
 	DEBUG_TRACE (DEBUG::Locale, string_compose ("main() locale '%1'\n", setlocale (LC_NUMERIC, NULL)));
 
+	setup_gtk_ardour_enums ();
+
 	if (UIConfiguration::instance().pre_gui_init ()) {
 		error << _("Could not complete pre-GUI initialization") << endmsg;
 		exit (EXIT_FAILURE);