diff --git a/gtk2_ardour/video_monitor.cc b/gtk2_ardour/video_monitor.cc
index 75ae6b4946..f0240b79be 100644
--- a/gtk2_ardour/video_monitor.cc
+++ b/gtk2_ardour/video_monitor.cc
@@ -102,6 +102,7 @@ VideoMonitor::quit ()
 	if (!is_started()) return;
 	if (state_connection.connected()) { state_connection.disconnect(); }
 	if (clock_connection.connected()) { clock_connection.disconnect(); }
+	query_full_state(true);
 	process->write_to_stdin("quit\n");
 	/* the 'quit' command should result in process termination
 	 * but in case it fails (communication failure, SIGSTOP, ??)
diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc
index 3b3d401c5e..176752f867 100644
--- a/gtk2_ardour/video_timeline.cc
+++ b/gtk2_ardour/video_timeline.cc
@@ -762,6 +762,7 @@ VideoTimeLine::control_video_monitor(int what, int param) {
 void
 VideoTimeLine::terminated_video_monitor () {
 	if (vmonitor) {
+		vmonitor->save_session();
 		delete vmonitor;
 	}
 	GuiUpdate("set-xjadeo-active-off");