diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
index aff72fbf6e..4c0c551c18 100644
--- a/gtk2_ardour/audio_clock.cc
+++ b/gtk2_ardour/audio_clock.cc
@@ -747,6 +747,10 @@ AudioClock::edit_next_field ()
 bool
 AudioClock::on_key_press_event (GdkEventKey* ev)
 {
+	if (editing_field == 0) {
+		return false;
+	}
+	
 	/* return true for keys that we MIGHT use 
 	   at release
 	*/
@@ -2015,4 +2019,3 @@ AudioClock::set_off (bool yn)
 	
 	set (_canonical_time, true);
 }
-
diff --git a/libs/gtkmm2ext/cairocell.cc b/libs/gtkmm2ext/cairocell.cc
index 86dac26f2c..f20f537e1b 100644
--- a/libs/gtkmm2ext/cairocell.cc
+++ b/libs/gtkmm2ext/cairocell.cc
@@ -211,7 +211,6 @@ CairoEditableText::CairoEditableText (boost::shared_ptr<CairoFontDescription> fo
 	set_flags (Gtk::CAN_FOCUS);
 
 	set_can_default (true);
-	set_receives_default (true);
 }
 
 CairoEditableText::~CairoEditableText ()