diff --git a/library/control/src/ProductControl.ycp b/library/control/src/ProductControl.ycp
index ce5ccbf15..277c7b57f 100644
--- a/library/control/src/ProductControl.ycp
+++ b/library/control/src/ProductControl.ycp
@@ -906,7 +906,9 @@ global define void UpdateWizardSteps(list<map> stagemode)
 
     // bnc#813072: stagemode has changed, re-enable all disabled modules
     // and proposals and other items
-    if (stagemode != last_stage_mode) {
+    // function must not be called if there was no previous stage_mode
+    // otherwise it resets everything
+    if (size(last_stage_mode) > 0 && stagemode != last_stage_mode) {
       ResetDisabledItems();
     }