diff --git a/prism/src/userinterface/model/GUIMultiModel.java b/prism/src/userinterface/model/GUIMultiModel.java
index f40b84d1..0bce3c11 100644
--- a/prism/src/userinterface/model/GUIMultiModel.java
+++ b/prism/src/userinterface/model/GUIMultiModel.java
@@ -129,6 +129,11 @@ public class GUIMultiModel extends GUIPlugin implements PrismSettingsListener
 		return popup;
 	}
 
+	public boolean getComputing()
+	{
+		return computing;
+	}
+	
 	public void doEnables()
 	{
 		// do nothing if not initialised yet
diff --git a/prism/src/userinterface/model/GUIMultiModelHandler.java b/prism/src/userinterface/model/GUIMultiModelHandler.java
index ea06207e..a61e8929 100644
--- a/prism/src/userinterface/model/GUIMultiModelHandler.java
+++ b/prism/src/userinterface/model/GUIMultiModelHandler.java
@@ -849,6 +849,7 @@ public class GUIMultiModelHandler extends JPanel implements PrismModelListener
 		{
 			public void run()
 			{
+				editor.modelParseSuccessful();
 				updateBuiltModelDisplay();
 				theModel.doEnables();
 				theModel.notifyEventListeners(new GUIModelEvent(GUIModelEvent.MODEL_BUILT, lastMFConstants));
@@ -889,7 +890,10 @@ public class GUIMultiModelHandler extends JPanel implements PrismModelListener
 			{
 				if (lastBuildError != null && lastBuildError instanceof PrismLangException) {
 					editor.modelParseFailed((PrismLangException) lastBuildError, false);
-					theModel.tabToFront();
+					// Bring model tab to front, but only if not busy e.g. with experiment
+					if (!theModel.getComputing()) {
+						theModel.tabToFront();
+					}
 				}
 				updateBuiltModelDisplay();
 				theModel.doEnables();