diff --git a/Vermaat.Crm.Specflow.Sample/app.config b/Vermaat.Crm.Specflow.Sample/app.config
index 476d0eca..f69efeea 100644
--- a/Vermaat.Crm.Specflow.Sample/app.config
+++ b/Vermaat.Crm.Specflow.Sample/app.config
@@ -12,7 +12,8 @@
   </specFlow>
   <appSettings file="appsettings.config">
     <add key="Target" value="" />
-    <add key="LanguageCode" value="1033" />
+	<add key="Headless" value="false" />
+	<add key="LanguageCode" value="1033" />
     <add key="DefaultDataFile" value="DefaultData.xml" />
     <add key="AppName" value="mv_SpecFlowDemo" />
     <add key="ClientSettingsProvider.ServiceUri" value="" />
diff --git a/Vermaat.Crm.Specflow/EasyRepro/TemporaryFixes.cs b/Vermaat.Crm.Specflow/EasyRepro/TemporaryFixes.cs
index c48c6136..99bc4eb7 100644
--- a/Vermaat.Crm.Specflow/EasyRepro/TemporaryFixes.cs
+++ b/Vermaat.Crm.Specflow/EasyRepro/TemporaryFixes.cs
@@ -52,6 +52,7 @@ public static BrowserCommandResult<bool> SetValueFix(this WebClient client, stri
                         d => dateField.GetAttribute("value") == date,
                         new TimeSpan(0, 0, 9), 3
                     );
+                    driver.ClearFocus();
                     driver.WaitForTransaction();
                 }
                 catch (WebDriverTimeoutException ex)
diff --git a/Vermaat.Crm.Specflow/SeleniumTestingContext.cs b/Vermaat.Crm.Specflow/SeleniumTestingContext.cs
index 3814bed4..88e4c2a2 100644
--- a/Vermaat.Crm.Specflow/SeleniumTestingContext.cs
+++ b/Vermaat.Crm.Specflow/SeleniumTestingContext.cs
@@ -1,4 +1,5 @@
 using Microsoft.Dynamics365.UIAutomation.Browser;
+using System;
 using Vermaat.Crm.Specflow.EasyRepro;
 
 namespace Vermaat.Crm.Specflow
@@ -24,7 +25,7 @@ public SeleniumTestingContext(CrmTestingContext crmContext)
                 UCITestMode = true,
             };
             CurrentApp = HelperMethods.GetAppSettingsValue("AppName", true);
-
+            BrowserOptions.Headless = Convert.ToBoolean(HelperMethods.GetAppSettingsValue("Headless", true, "false"));
         }
 
         public UCIBrowser GetBrowser()