--- a/branches/yubico2_2/src/ui/wxWidgets/safecombinationsetup.cpp
+++ b/branches/yubico2_2/src/ui/wxWidgets/safecombinationsetup.cpp
@@ -96,6 +96,8 @@
   Centre();
 ////@end CSafeCombinationSetup creation
   SetupMixin(FindWindow(ID_YUBIBTN), FindWindow(ID_YUBISTATUS));
+  m_pollingTimer = new wxTimer(this, POLLING_TIMER_ID);
+  m_pollingTimer->Start(250); // check for Yubikey every 250ms.
   return true;
 }
 
@@ -108,6 +110,7 @@
 {
 ////@begin CSafeCombinationSetup destruction
 ////@end CSafeCombinationSetup destruction
+  delete m_pollingTimer;
 }