diff --git a/src/solvespace.cpp b/src/solvespace.cpp
index 5e9b963..d4d8302 100644
--- a/src/solvespace.cpp
+++ b/src/solvespace.cpp
@@ -305,12 +305,14 @@ void SolveSpaceUI::Exit() {
 void SolveSpaceUI::Refresh() {
     // generateAll must happen bfore updating displays
     if(scheduledGenerateAll) {
-        GenerateAll(Generate::DIRTY, /*andFindFree=*/false, /*genForBBox=*/false);
+		// Clear the flag so that if the call to GenerateAll is blocked by a Message or Error, 
+		// subsequent refreshes do not try to Generate again.
         scheduledGenerateAll = false;
+        GenerateAll(Generate::DIRTY, /*andFindFree=*/false, /*genForBBox=*/false);   
     }
     if(scheduledShowTW) {
-        TW.Show();
         scheduledShowTW = false;
+        TW.Show();
     }
 }