diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 76565fd6bc..2cae8a8e48 100644
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -372,6 +372,8 @@ Editor::controls_layout_size_request (Requisition* req)
 
 	if (req->width != width) {
 		req->width = width;
+		time_button_event_box.set_size_request(edit_controls_vbox.get_width(), -1);
+		zoom_box.set_size_request(edit_controls_vbox.get_width(), -1);
 	}
 
 	gint height = min ( (gint) pos, (screen->get_height() - 400));
@@ -379,15 +381,13 @@ Editor::controls_layout_size_request (Requisition* req)
 		req->height = height;
 	}
 
-	if ((width != edit_controls_vbox.get_width()) || height !=  pos) {
+	if (width != edit_controls_vbox.get_width()) {
 
 		/* this one is important: it determines how big the layout thinks it really is, as 
 		   opposed to what it displays on the screen
 		*/
 		controls_layout.set_size (edit_controls_vbox.get_width(), (guint) floor (pos));
 		controls_layout.set_size_request(edit_controls_vbox.get_width(), -1);
-		time_button_event_box.set_size_request(edit_controls_vbox.get_width(), -1);
-		zoom_box.set_size_request(edit_controls_vbox.get_width(), -1);
 	}
 
 	//cerr << "sizes = " << req->width << " " << edit_controls_vbox.get_width() << " " << controls_layout.get_width() << " " << zoom_box.get_width() << " " << time_button_frame.get_width() << endl;//DEBUG	
diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index 6334b72ce7..04e66d5ae1 100644
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -798,7 +798,7 @@ Editor::update_ruler_visibility ()
 	time_canvas_event_box.queue_resize();
 	
 	update_fixed_rulers();
-	redisplay_tempo (false);
+	//redisplay_tempo (false);
 
 	time_canvas_event_box.show_all();
 	ruler_label_event_box.show_all();