diff --git a/src/TestStack.White.UITests/App.config b/src/TestStack.White.UITests/App.config
index 74ff35fc..20949af6 100644
--- a/src/TestStack.White.UITests/App.config
+++ b/src/TestStack.White.UITests/App.config
@@ -9,6 +9,7 @@
     <Core>
       <add key="TooltipWaitTime" value="3000"/>
       <add key="BusyTimeout" value="10000"/>
+      <add key="ComboBoxItemSelectDelay" value="100" />
     </Core>
   </White>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/src/TestStack.White.UITests/ControlTests/ListControls/ComboBoxTests.cs b/src/TestStack.White.UITests/ControlTests/ListControls/ComboBoxTests.cs
index b8a2f91e..f76bbc39 100644
--- a/src/TestStack.White.UITests/ControlTests/ListControls/ComboBoxTests.cs
+++ b/src/TestStack.White.UITests/ControlTests/ListControls/ComboBoxTests.cs
@@ -7,10 +7,9 @@
 
 namespace TestStack.White.UITests.ControlTests.ListControls
 {
-    [TestFixture(WindowsFramework.WinForms)]
+    //[TestFixture(WindowsFramework.WinForms)]
+    // Problem with WinForms tests
     [TestFixture(WindowsFramework.Wpf)]
-    [Category("NeedsFix")]
-    [Ignore("NeedsFix")]
     public class ComboBoxTests : WhiteUITestBase
     {
         protected ComboBox ComboBoxUnderTest { get; set; }
diff --git a/src/TestStack.White/Configuration/CoreAppXmlConfiguration.cs b/src/TestStack.White/Configuration/CoreAppXmlConfiguration.cs
index 861734bf..d69dd86d 100644
--- a/src/TestStack.White/Configuration/CoreAppXmlConfiguration.cs
+++ b/src/TestStack.White/Configuration/CoreAppXmlConfiguration.cs
@@ -31,6 +31,7 @@ static CoreAppXmlConfiguration()
             DefaultValues.Add("InProc", false);
             DefaultValues.Add("ComboBoxItemsPopulatedWithoutDropDownOpen", false);
             DefaultValues.Add("ComboBoxItemSelectionTimeout", 1000);
+            DefaultValues.Add("ComboBoxItemSelectDelay", 10);
             DefaultValues.Add("RawInputQueueProcessingTime", 50);
             DefaultValues.Add("RawElementBasedSearch", false);
             DefaultValues.Add("MaxElementSearchDepth", 10);
@@ -164,6 +165,12 @@ public virtual int ComboBoxItemSelectionTimeout
             set { SetUsedValue("ComboBoxItemSelectionTimeout", value); }
         }
 
+        public virtual int ComboBoxItemSelectDelay
+        {
+            get { return Convert.ToInt32(UsedValues["ComboBoxItemSelectDelay"]); }
+            set { SetUsedValue("ComboBoxItemSelectDelay", value); }
+        }
+
         public virtual int RawInputQueueProcessingTime
         {
             get { return Convert.ToInt32(UsedValues["RawInputQueueProcessingTime"]); }
diff --git a/src/TestStack.White/Configuration/ICoreConfiguration.cs b/src/TestStack.White/Configuration/ICoreConfiguration.cs
index 0850f679..82051d5d 100644
--- a/src/TestStack.White/Configuration/ICoreConfiguration.cs
+++ b/src/TestStack.White/Configuration/ICoreConfiguration.cs
@@ -33,6 +33,7 @@ public interface ICoreConfiguration
         bool InProc { get; set; }
         bool ComboBoxItemsPopulatedWithoutDropDownOpen { get; set; }
         int ComboBoxItemSelectionTimeout { get; set; }
+        int ComboBoxItemSelectDelay { get; set; }
         int RawInputQueueProcessingTime { get; set; }
         bool RawElementBasedSearch { get; set; }
         int MaxElementSearchDepth { get; set; }
diff --git a/src/TestStack.White/UIItems/ListBoxItems/ListItem.cs b/src/TestStack.White/UIItems/ListBoxItems/ListItem.cs
index 3ebee982..3500e9ea 100644
--- a/src/TestStack.White/UIItems/ListBoxItems/ListItem.cs
+++ b/src/TestStack.White/UIItems/ListBoxItems/ListItem.cs
@@ -81,7 +81,7 @@ private static void WaitForBoundsToStabilise(IUIItem item)
             Retry.For(() =>
             {
                 var oldBounds = item.Bounds;
-                Thread.Sleep(10);
+                Thread.Sleep(CoreAppXmlConfiguration.Instance.ComboBoxItemSelectDelay);
                 return oldBounds.Equals(item.Bounds);
             }, TimeSpan.FromSeconds(1), TimeSpan.FromMilliseconds(10));
         }