diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 0348940907..ead64e378d 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -1719,10 +1719,8 @@ Editor::tav_zoom_smooth (bool coarser, bool force_all)
 void
 Editor::temporal_zoom_step_mouse_focus_scale (bool zoom_out, double scale)
 {
-	Editing::ZoomFocus temp_focus = zoom_focus;
-	zoom_focus = Editing::ZoomFocusMouse;
+	PBD::Unwinder<Editing::ZoomFocus> zf (zoom_focus, Editing::ZoomFocusMouse);
 	temporal_zoom_step_scale (zoom_out, scale);
-	zoom_focus = temp_focus;
 }
 
 void