diff --git a/src/+gui_auxiliary/dynare_command_options_sensitivity.m b/src/+gui_auxiliary/dynare_command_options_sensitivity.m
index b13c19dd16a9eb78ee3bb7eb551867a77b1e9dde..691a17fce18b15b77ee075ae3761234eab19b152 100644
--- a/src/+gui_auxiliary/dynare_command_options_sensitivity.m
+++ b/src/+gui_auxiliary/dynare_command_options_sensitivity.m
@@ -14,7 +14,7 @@ function dynare_command_options_sensitivity()
 % SPECIAL REQUIREMENTS
 %   none
 
-% Copyright (C) 2019 Dynare Team
+% Copyright (C) 2019-2020 Dynare Team
 %
 % This file is part of Dynare.
 %
@@ -92,7 +92,7 @@ dynare_gui_.sensitivity.sampling{num,4} = 'When pprior=0 and ppost=0, allows for
 %% Group 2: stability mapping
 num = 1;
 dynare_gui_.sensitivity.stability_mapping{num,1} = 'stab';
-dynare_gui_.sensitivity.stability_mapping{num,2} = 0;
+dynare_gui_.sensitivity.stability_mapping{num,2} = 1;
 dynare_gui_.sensitivity.stability_mapping{num,3} = 'check_option';
 dynare_gui_.sensitivity.stability_mapping{num,4} = 'If equal to 1, perform stability mapping. If equal to 0, do not perform stability mapping.';
 
diff --git a/src/gui_sensitivity_analysis.m b/src/gui_sensitivity_analysis.m
index 23a2b78fe78894641a669f0d7d0ee8c914a3a5e9..a703bbc541c4f9cd3e143de3aac2ffd82131bbc8 100644
--- a/src/gui_sensitivity_analysis.m
+++ b/src/gui_sensitivity_analysis.m
@@ -11,7 +11,7 @@ function gui_sensitivity_analysis(tabId)
 % SPECIAL REQUIREMENTS
 %   none
 
-% Copyright (C) 2019 Dynare Team
+% Copyright (C) 2019-2020 Dynare Team
 %
 % This file is part of Dynare.
 %
@@ -68,20 +68,38 @@ handles.pushbuttonSensitivity = uicontrol( ...
         old_oo_ = oo_;
         old_options_ = options_;
         try
-            options_ = struct();
             if ~isempty(model_settings.sensitivity)
                 names = fieldnames(model_settings.sensitivity);
+                options_gsa = model_settings.sensitivity;
+                options_ = old_options_;
                 for ii = 1:size(names, 1)
-                    if isempty(model_settings.sensitivity.(names{ii}))
-                        gui_auxiliary.set_command_option(names{ii}, 1, 'check_option');
-                    else
-                        gui_auxiliary.set_command_option(names{ii}, model_settings.sensitivity.(names{ii}));
+                    switch names{ii}
+                        case 'namendo'
+                            if contains(options_gsa.(names{ii}), ',')
+                                namendo_ = strsplit(options_gsa.(names{ii}), ',');
+                                options_gsa.namendo = namendo_;
+                            else
+                                options_gsa.namendo = {options_gsa.(names{ii})};
+                            end
+                        case 'namlagendo'
+                            if contains(options_gsa.(names{ii}), ',')
+                                namlagendo_ = strsplit(options_gsa.(names{ii}), ',');
+                                options_gsa.namlagendo = namlagendo_;
+                            else
+                                options_gsa.namlagendo = {options_gsa.(names{ii})};
+                            end
+                        case 'namexo'
+                            if contains(options_gsa.(names{ii}), ',')
+                                namexo_ = strsplit(options_gsa.(names{ii}), ',');
+                                options_gsa.namexo = namexo_;
+                            else
+                                options_gsa.namexo = {options_gsa.(names{ii})};
+                            end
+                        case 'threshold_redform'
+                            options_gsa.threshold_redform = str2num(options_gsa.(names{ii}));
                     end
                 end
             end
-            options_gsa = options_;
-            options_ = old_options_;
-
             gui_tools.project_log_entry('Running stochastic sensitivity','...');
             [jObj, guiObj] = gui_tools.create_animated_screen('Running stochastic sensitivity, please wait...', tabId);
             handles.pushbuttonResults.Enable = 'off';