diff --git a/macosx/Controller.m b/macosx/Controller.m
index f5666639e..7751c0f8e 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -442,6 +442,8 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
     [self autoSpeedLimitChange: nil];
     fSpeedLimitTimer = [NSTimer scheduledTimerWithTimeInterval: AUTO_SPEED_LIMIT_SECONDS target: self 
         selector: @selector(autoSpeedLimit) userInfo: nil repeats: YES];
+    [[NSRunLoop currentRunLoop] addTimer: fSpeedLimitTimer forMode: NSModalPanelRunLoopMode];
+    [[NSRunLoop currentRunLoop] addTimer: fSpeedLimitTimer forMode: NSEventTrackingRunLoopMode];
 }
 
 - (void) applicationDidFinishLaunching: (NSNotification *) notification