diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 2e28ecf9e8..1331eebfc0 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -181,7 +181,7 @@ public:
 	XMLNode& get_state ();
 	int set_state (const XMLNode&, int version);
 
-	void set_mouse_mode (Editing::MouseMode, bool force=true);
+	void set_mouse_mode (Editing::MouseMode, bool force = false);
 	void step_mouse_mode (bool next);
 	Editing::MouseMode current_mouse_mode () const { return mouse_mode; }
 	Editing::MidiEditMode current_midi_edit_mode () const;
diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h
index da024706cf..9fbdb106bc 100644
--- a/gtk2_ardour/public_editor.h
+++ b/gtk2_ardour/public_editor.h
@@ -299,7 +299,7 @@ public:
 	 * @param yn true to follow playhead, otherwise false.
 	 * @param catch_up true to reset the editor view to show the playhead (if yn == true), otherwise false.
 	 */
-	virtual void set_follow_playhead (bool yn, bool catch_up = false) = 0;
+	virtual void set_follow_playhead (bool yn, bool catch_up = true) = 0;
 
 	/** Toggle whether the editor is following the playhead */
 	virtual void toggle_follow_playhead () = 0;