diff --git a/src/+gui_tools/menu_options.m b/src/+gui_tools/menu_options.m
index b1d975e50ca5bfe9665fc3fc2b0f4c68a8f07bea..56ef718ccf905bbb40220318ec50624e26fe3cd0 100644
--- a/src/+gui_tools/menu_options.m
+++ b/src/+gui_tools/menu_options.m
@@ -71,28 +71,29 @@ switch oid
 
     case 'output'
         if strcmpi(status, 'off')
-            handles.output_shocks_dec.Enable = status;
-            handles.output_shocks_decomposition.Enable = status;
-            handles.output_realtime_shocks_decomposition.Enable = status;
-            handles.output_conditional_forecast.Enable = status;
-            handles.output_forecast.Enable = status;
+            handles.output_shocks_dec.Enable = 'off';
+            handles.output_shocks_decomposition.Enable = 'off';
+            handles.output_realtime_shocks_decomposition.Enable = 'off';
+            handles.output_conditional_forecast.Enable = 'off';
+            handles.output_forecast.Enable = 'off';
         else
             if project_info.estimation_run
                 handles.output_shocks_dec.Enable = status;
                 handles.output_shocks_decomposition.Enable = status;
                 handles.output_realtime_shocks_decomposition.Enable = status;
-                if (isfield(oo_, 'dr') && isfield(oo_.dr, 'ghu')) || isfield(oo_, 'SmoothedShocks')
-                    handles.output_conditional_forecast.Enable = status;
-                end
-                if isfield(M_, 'histval_dseries') || isfield(oo_, 'SmoothedVariables')
+                if isfield(oo_, 'SmoothedVariables')
                     handles.output_forecast.Enable = status;
+                    handles.output_conditional_forecast.Enable = status;
                 end
             end
-            if project_info.stochastic_simulation_run && project_info.observed_variables_set
-                handles.output_shocks_dec.Enable = status;
-                handles.output_shocks_decomposition.Enable = status;
-                handles.output_realtime_shocks_decomposition.Enable = status;
+            if project_info.stochastic_simulation_run
+                handles.output_forecast.Enable = status;
                 handles.output_conditional_forecast.Enable = status;
+                if project_info.observed_variables_set
+                    handles.output_shocks_dec.Enable = status;
+                    handles.output_shocks_decomposition.Enable = status;
+                    handles.output_realtime_shocks_decomposition.Enable = status;
+                end
             end
             if (project_info.realtime_shock_decomposition_run || project_info.shock_decomposition_run) ...
                     && project_info.observed_variables_set