2 files changed, 4 insertions, 0 deletions
diff --git a/src/ui/dialog/fill-and-stroke.cpp b/src/ui/dialog/fill-and-stroke.cpp
index d4c216187..b9e1754ba 100644
--- a/src/ui/dialog/fill-and-stroke.cpp
+++ b/src/ui/dialog/fill-and-stroke.cpp
@@ -60,10 +60,13 @@ FillAndStroke::FillAndStroke()
     contents->pack_start(_composite_settings, false, false, 0);
 
     show_all_children();
+
+    _composite_settings.setSubject(&_subject);
 }
 
 FillAndStroke::~FillAndStroke()
 {
+    _composite_settings.setSubject(NULL);
 }
 
 void
diff --git a/src/ui/dialog/fill-and-stroke.h b/src/ui/dialog/fill-and-stroke.h
index ee8c32b4f..37aa4ccc8 100644
--- a/src/ui/dialog/fill-and-stroke.h
+++ b/src/ui/dialog/fill-and-stroke.h
@@ -52,6 +52,7 @@ protected:
     NotebookPage    _page_stroke_paint;
     NotebookPage    _page_stroke_style;
 
+    StyleSubject::Selection _subject;
     ObjectCompositeSettings _composite_settings;
 
     Gtk::HBox &_createPageTabLabel(const Glib::ustring &label,