diff --git a/matlab/expand_group.m b/matlab/expand_group.m
index 8b785c271..06ad4e8f0 100644
--- a/matlab/expand_group.m
+++ b/matlab/expand_group.m
@@ -31,7 +31,9 @@ M = evalin('base','M_');
 oo = evalin('base','oo_');
 options = evalin('base','options_');
 mydata=get(findobj(gcf,'tag',['group' int2str(ic)]),'userdata');
-
+if isfield(mydata,'graph_decomp')
+    options.graph_decomp=mydata.graph_decomp;
+end
 % define expanded group
 label = mydata.shock_group.label;
 shocks = mydata.shock_group.shocks;
diff --git a/matlab/graph_decomp.m b/matlab/graph_decomp.m
index f831de70f..1f24ac166 100644
--- a/matlab/graph_decomp.m
+++ b/matlab/graph_decomp.m
@@ -192,6 +192,7 @@ for j=1:nvar
             mydata.fig_names = DynareOptions.shock_decomp.fig_names(2:end);
             mydata.use_shock_groups = DynareOptions.use_shock_groups;
             mydata.shock_group = shock_groups.(shock_ind{i});
+            mydata.shock_decomp = DynareOptions.shock_decomp;
             if ~isempty(mydata.shock_group.shocks{1})
                 c = uicontextmenu;
                 hl.UIContextMenu=c;
diff --git a/matlab/graph_decomp_detail.m b/matlab/graph_decomp_detail.m
index 3e0157e32..931cb64a2 100644
--- a/matlab/graph_decomp_detail.m
+++ b/matlab/graph_decomp_detail.m
@@ -182,6 +182,7 @@ for j=1:nvar
             mydata.fig_names = DynareOptions.shock_decomp.fig_names(2:end);
             mydata.use_shock_groups = DynareOptions.use_shock_groups;
             mydata.shock_group = shock_groups.(shock_ind{ic});
+            mydata.shock_decomp = DynareOptions.shock_decomp;
             if ~isempty(mydata.shock_group.shocks{1})
                 c = uicontextmenu;
                 hax.UIContextMenu=c;