diff --git a/libgimp/gimpproceduredialog.c b/libgimp/gimpproceduredialog.c
index 6b29a29ea0..9bd57581e8 100644
--- a/libgimp/gimpproceduredialog.c
+++ b/libgimp/gimpproceduredialog.c
@@ -788,6 +788,7 @@ gimp_procedure_dialog_get_widget (GimpProcedureDialog *dialog,
           gtk_text_view_set_bottom_margin (GTK_TEXT_VIEW (widget), 3);
           gtk_text_view_set_left_margin (GTK_TEXT_VIEW (widget), 3);
           gtk_text_view_set_right_margin (GTK_TEXT_VIEW (widget), 3);
+          gtk_widget_set_hexpand (widget, TRUE);
           g_object_unref (buffer);
         }
       else if (widget_type == GTK_TYPE_ENTRY)
diff --git a/libgimpwidgets/gimppropwidgets.c b/libgimpwidgets/gimppropwidgets.c
index d4ad63e037..d9dd3585f3 100644
--- a/libgimpwidgets/gimppropwidgets.c
+++ b/libgimpwidgets/gimppropwidgets.c
@@ -2242,6 +2242,7 @@ gimp_prop_entry_new (GObject     *config,
 
   gtk_editable_set_editable (GTK_EDITABLE (entry),
                              param_spec->flags & G_PARAM_WRITABLE);
+  gtk_widget_set_hexpand (entry, TRUE);
 
   set_param_spec (G_OBJECT (entry), entry, param_spec);
 
@@ -2361,6 +2362,7 @@ gimp_prop_label_entry_new (GObject     *config,
 
   gtk_editable_set_editable (GTK_EDITABLE (entry),
                              param_spec->flags & G_PARAM_WRITABLE);
+  gtk_widget_set_hexpand (entry, TRUE);
 
   set_param_spec (G_OBJECT (label_entry), label_entry, param_spec);