diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc
index 18586caed9..b225e47c0d 100644
--- a/gtk2_ardour/audio_time_axis.cc
+++ b/gtk2_ardour/audio_time_axis.cc
@@ -578,7 +578,7 @@ AudioTimeAxisView::set_state (const XMLNode& node)
 void
 AudioTimeAxisView::set_height (TrackHeight h)
 {
-	bool height_changed = (h != height_style);
+	bool height_changed = (height == 0) || (h != height_style);
 
 	TimeAxisView::set_height (h);
 
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index bf8b16c0d7..50527f51d6 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -168,7 +168,7 @@ Editor::set_mouse_mode (MouseMode m, bool force)
 		return;
 	}
 
-	if (m == mouse_mode && !force) {
+	if (!force && m == mouse_mode) {
 		return;
 	}
 	
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index 4cbb8a8f47..9d0228dba6 100644
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -152,6 +152,8 @@ GainMeter::GainMeter (IO& io, Session& s)
 	hbox.set_spacing (0);
 	hbox.pack_start (*fader_vbox, false, false, 2);
 
+	set_width(Narrow);
+
 	Route* r;
 
 	if ((r = dynamic_cast<Route*> (&_io)) != 0) {
diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc
index f430e9c19a..5fc659d2f8 100644
--- a/gtk2_ardour/panner_ui.cc
+++ b/gtk2_ardour/panner_ui.cc
@@ -144,6 +144,8 @@ PannerUI::PannerUI (IO& io, Session& s)
 
 	panner = 0;
 
+	set_width(Narrow);
+
 	_io.panner().Changed.connect (mem_fun(*this, &PannerUI::panner_changed));
 	_io.panner().LinkStateChanged.connect (mem_fun(*this, &PannerUI::update_pan_linkage));
 	_io.panner().StateChanged.connect (mem_fun(*this, &PannerUI::update_pan_state));