diff --git a/src/gui/game/GOLTool.cpp b/src/gui/game/GOLTool.cpp
index adddce985..88c27404d 100644
--- a/src/gui/game/GOLTool.cpp
+++ b/src/gui/game/GOLTool.cpp
@@ -51,12 +51,12 @@ toolSelection(toolSelection)
 	okayButton->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
 	okayButton->Appearance.BorderInactive = ui::Colour(200, 200, 200);
 	okayButton->SetActionCallback({ [this] {
-		CloseActiveWindow();
 		if (nameField->GetText().length() && ruleField->GetText().length())
 		{
+			CloseActiveWindow();
 			Validate();
+			SelfDestruct();
 		}
-		SelfDestruct();
 	} });
 	AddComponent(okayButton);
 	SetOkayButton(okayButton);
diff --git a/src/gui/game/PropertyTool.cpp b/src/gui/game/PropertyTool.cpp
index 1abe9c149..b425b1348 100644
--- a/src/gui/game/PropertyTool.cpp
+++ b/src/gui/game/PropertyTool.cpp
@@ -57,10 +57,12 @@ sim(sim_)
 	okayButton->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
 	okayButton->Appearance.BorderInactive = ui::Colour(200, 200, 200);
 	okayButton->SetActionCallback({ [this] {
-		CloseActiveWindow();
 		if (textField->GetText().length())
+		{
+			CloseActiveWindow();
 			SetProperty();
-		SelfDestruct();
+			SelfDestruct();
+		}
 	} });
 	AddComponent(okayButton);
 	SetOkayButton(okayButton);