diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc
index 58a22508ec..e1f2314724 100644
--- a/gtk2_ardour/theme_manager.cc
+++ b/gtk2_ardour/theme_manager.cc
@@ -290,6 +290,8 @@ void
 ThemeManager::on_show_clip_toggled ()
 {
 	ARDOUR_UI::config()->set_show_waveform_clipping (show_clipping_button.get_active());
+	// "show-waveform-clipping" was a session config key
+	ArdourCanvas::WaveView::set_global_show_waveform_clipping (ARDOUR_UI::config()->get_show_waveform_clipping());
 }
 
 void
diff --git a/libs/canvas/wave_view.cc b/libs/canvas/wave_view.cc
index 553bcdf5d3..9c4ae778fe 100644
--- a/libs/canvas/wave_view.cc
+++ b/libs/canvas/wave_view.cc
@@ -1031,6 +1031,6 @@ WaveView::set_global_show_waveform_clipping (bool yn)
 {
 	if (_global_show_waveform_clipping != yn) {
 		_global_show_waveform_clipping = yn;
-		VisualPropertiesChanged (); /* EMIT SIGNAL */
+		ClipLevelChanged ();
 	}
 }