3 files changed, 9 insertions, 11 deletions
diff --git a/src/ui/widget/filter-effect-chooser.cpp b/src/ui/widget/filter-effect-chooser.cpp
index a2519d4bb..cb9d3e7e0 100644
--- a/src/ui/widget/filter-effect-chooser.cpp
+++ b/src/ui/widget/filter-effect-chooser.cpp
@@ -32,18 +32,11 @@ SimpleFilterModifier::SimpleFilterModifier(int flags)
 
     if (flags & BLEND) {
         add(_hb_blend);
-        _hb_blend.pack_start(_lb_blend);
+        _hb_blend.pack_start(_lb_blend, false, false, 0);
         _hb_blend.pack_start(_blend);
     }
     if (flags & BLUR) {
         add(_hb_blur);
-        /*
-         * Hack to get a min size of label, but still be able to expand if needed
-         * Should match ObjectCompositeSettings::_opacity_label
-         */
-        if (_lb_blur.get_text().length() < 7) {
-            _lb_blur.set_width_chars(7);
-        }
         #if WITH_GTKMM_2_22
             _lb_blur.set_alignment(Gtk::ALIGN_END, Gtk::ALIGN_CENTER);
         #else
diff --git a/src/ui/widget/filter-effect-chooser.h b/src/ui/widget/filter-effect-chooser.h
index 2d41eb3bf..2d5f04007 100644
--- a/src/ui/widget/filter-effect-chooser.h
+++ b/src/ui/widget/filter-effect-chooser.h
@@ -45,12 +45,15 @@ public:
     double get_blur_value() const;
     void set_blur_value(const double);
     void set_blur_sensitive(const bool);
+    Gtk::Label *get_blur_label() { return &_lb_blur; };
+
 
 private:
     int _flags;
     Gtk::HBox _hb_blend;
     Gtk::HBox _hb_blur;
     Gtk::Label _lb_blend, _lb_blur;
+
     ComboBoxEnum<Inkscape::Filters::FilterBlendMode> _blend;
     SpinSlider _blur;
 
diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp
index 9613f2d4f..fd9d71d6a 100644
--- a/src/ui/widget/object-composite-settings.cpp
+++ b/src/ui/widget/object-composite-settings.cpp
@@ -81,9 +81,6 @@ ObjectCompositeSettings::ObjectCompositeSettings(unsigned int verb_code, char co
 
     // Opacity
     pack_start(_opacity_vbox, false, false, 2);
-    if (_opacity_label.get_text().length() < 7) {
-        _opacity_label.set_width_chars(7);
-    }
 #if WITH_GTKMM_2_22
     _opacity_label.set_alignment(Gtk::ALIGN_END, Gtk::ALIGN_CENTER);
 #else
@@ -99,6 +96,11 @@ ObjectCompositeSettings::ObjectCompositeSettings(unsigned int verb_code, char co
     _opacity_adjustment.signal_value_changed().connect(sigc::mem_fun(*this, &ObjectCompositeSettings::_opacityValueChanged));
 	_opacity_label.set_mnemonic_widget(_opacity_hscale);
 
+    /* SizeGroup keeps the blur and opacity labels aligned in Fill & Stroke dlg */
+    GtkSizeGroup *labels = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+    gtk_size_group_add_widget(labels, (GtkWidget *) _opacity_label.gobj());
+    gtk_size_group_add_widget(labels, (GtkWidget *) _fe_cb.get_blur_label()->gobj());
+
     show_all_children();
 
     _desktop_activated = g_signal_connect ( G_OBJECT (INKSCAPE), "activate_desktop", G_CALLBACK (&ObjectCompositeSettings::_on_desktop_activate), this );