diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 1510090e5a..fc407a70ce 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -660,7 +660,10 @@ Editor::Editor ()
 
 	setup_toolbar ();
 
-	set_action_defaults ();
+	{
+		PBD::Unwinder<bool> uw (no_ruler_shown_update, true);
+		set_action_defaults ();
+	}
 
 	ARDOUR_UI::instance()->ActionsReady.connect_same_thread (*this, std::bind (&Editor::initialize_ruler_actions, this));
 
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index e601cd5180..e7ce4fd890 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -777,6 +777,8 @@ Editor::toggle_ruler_visibility ()
 		return;
 	}
 
+	assert (_session);
+
 	update_ruler_visibility ();
 	store_ruler_visibility ();
 }