diff --git a/matlab/initial_condition_decomposition.m b/matlab/initial_condition_decomposition.m
index af98862c6c3b2bebde7d4a3dfb98e50a750faecd..52e468a9f116758f68124d0e5604bc5c4783cad2 100644
--- a/matlab/initial_condition_decomposition.m
+++ b/matlab/initial_condition_decomposition.m
@@ -128,6 +128,11 @@ M_.exo_nbr = M_.endo_nbr;
 options_.plot_shock_decomp.realtime=0;
 options_.plot_shock_decomp.screen_shocks=1;
 options_.plot_shock_decomp.use_shock_groups = '';
-options_.plot_shock_decomp.fig_names='initval';
-plot_shock_decomposition(M_, oo, options_, varlist);
+fig_name = options_.plot_shock_decomp.fig_name;
+if ~isempty(fig_name)
+    options_.plot_shock_decomp.fig_name=[fig_name '_initval'];
+else
+options_.plot_shock_decomp.fig_name='initval';
+end   
+plot_shock_decomposition(M_,oo,options_,varlist);
 % end
\ No newline at end of file