diff --git a/libs/widgets/ardour_button.cc b/libs/widgets/ardour_button.cc
index 4c1ac05a93..a0000e4dc6 100644
--- a/libs/widgets/ardour_button.cc
+++ b/libs/widgets/ardour_button.cc
@@ -212,7 +212,12 @@ ArdourButton::set_text (const std::string& str, bool markup)
 		set_text_internal ();
 		/* on_size_request() will fill in _text_width/height
 		 * so queue it even if _sizing_text != "" */
-		queue_resize ();
+		if (_sizing_text.empty ()) {
+			queue_resize ();
+		} else {
+			_layout->get_pixel_size (_text_width, _text_height);
+			CairoWidget::set_dirty ();
+		}
 	}
 }