1 files changed, 5 insertions, 4 deletions
diff --git a/client/macrowindow.cc b/client/macrowindow.cc
index 481ee0c..04cc2cb 100644
--- a/client/macrowindow.cc
+++ b/client/macrowindow.cc
@@ -233,13 +233,14 @@ void MacroWindow::expandWrapper()
       }
     }
   }
-  if(mainwidget) setExpandedWidget(mainwidget->qwidget());
-  expand();
 
-  // Set values here, to be sure that the widgets are visible and thereby
-  //  validate correctly.
+  // Set values here, to be sure that the widgets are visible to the value
+  // system and thereby validate correctly.
   if(mainwidget) mainwidget->setValues();
 
+  if(mainwidget) setExpandedWidget(mainwidget->qwidget());
+  expand();
+
   // Set keyboard focus on the first focusable widget in the macro.
   QVector< Widget* > widgets;
   if(mainwidget) widgets = mainwidget->widgetList(true);