Index: gtk2_ardour/region_editor.cc
===================================================================
--- gtk2_ardour/region_editor.cc	(revision 13795)
+++ gtk2_ardour/region_editor.cc	(working copy)
@@ -30,6 +30,7 @@
 
 #include "ardour_ui.h"
 #include "clock_group.h"
+#include "main_clock.h"
 #include "gui_thread.h"
 #include "region_editor.h"
 #include "utils.h"
@@ -60,7 +61,7 @@
 {
 	set_session (s);
 
-        _clock_group->set_clock_mode (AudioClock::Frames);
+        _clock_group->set_clock_mode (ARDOUR_UI::instance()->secondary_clock->mode());
         _clock_group->add (position_clock);
         _clock_group->add (end_clock);
         _clock_group->add (length_clock);
Index: gtk2_ardour/location_ui.cc
===================================================================
--- gtk2_ardour/location_ui.cc	(revision 13795)
+++ gtk2_ardour/location_ui.cc	(working copy)
@@ -27,6 +27,7 @@
 
 #include "ardour_ui.h"
 #include "clock_group.h"
+#include "main_clock.h"
 #include "gui_thread.h"
 #include "keyboard.h"
 #include "location_ui.h"
@@ -1120,7 +1121,7 @@
 
 	XMLProperty* p = node->property (X_("clock-mode"));
 	if (!p) {
-		return AudioClock::Frames;
+		return ARDOUR_UI::instance()->secondary_clock->mode();
 	}
 	      
 	return (AudioClock::Mode) string_2_enum (p->value (), AudioClock::Mode);