diff --git a/src/ui/toolbar/text-toolbar.cpp b/src/ui/toolbar/text-toolbar.cpp
index 0145a01c4f5eb139540e1addaa08d20f8ef8bbc6..9743ce5244c1a64b36fa37574f0b381e45ed77d3 100644
--- a/src/ui/toolbar/text-toolbar.cpp
+++ b/src/ui/toolbar/text-toolbar.cpp
@@ -2007,7 +2007,7 @@ void TextToolbar::selection_changed(Inkscape::Selection *selection) // don't bot
         Glib::RefPtr<Gtk::ListStore> store = _align_item->get_store();
         Gtk::TreeModel::Row row = *(store->get_iter("3"));  // Justify entry
         UI::Widget::ComboToolItemColumns columns;
-        row[columns.col_sensitive] = isFlow;
+        row[columns.col_sensitive] = isFlow || query.shape_inside.set;
 
         int activeButton = 0;
         if (query.text_align.computed  == SP_CSS_TEXT_ALIGN_JUSTIFY)