diff --git a/matRad/gui/widgets/matRad_PlanWidget.m b/matRad/gui/widgets/matRad_PlanWidget.m
index 62e521a2b..0ea2925f5 100644
--- a/matRad/gui/widgets/matRad_PlanWidget.m
+++ b/matRad/gui/widgets/matRad_PlanWidget.m
@@ -894,13 +894,17 @@
                 if ~isfield(pln,'multScen')
                     ix = 1;
                 else
-                    ix = find(strcmp(pln.multScen.shortName,contentPopUpMultScen));
+                    ix = find(strcmp(pln.multScen,contentPopUpMultScen));
                 end
                 set(handles.popMenuMultScen,'Value',ix);
             end
 
-
-            set(handles.btnRunDAO,'Value',pln.propOpt.runDAO);
+            if strcmp(pln.radiationMode,'photons') && isfield(pln.propOpt,'runDAO')
+                set(handles.btnRunDAO,'Value',pln.propOpt.runDAO);
+            else
+                set(handles.btnRunDAO,'Value', 0 );
+            end
+                
             if isfield(pln, 'propSeq') && isfield(pln.propSeq, 'sequencingLevel')
                 set(handles.btnRunSequencing,'Value',pln.propSeq.runSequencing);
                 set(handles.editSequencingLevel,'String',num2str(pln.propSeq.sequencingLevel));