diff --git a/atom/common/lib/init.coffee b/atom/common/lib/init.coffee
index cde0ea3075..4bc3e36986 100644
--- a/atom/common/lib/init.coffee
+++ b/atom/common/lib/init.coffee
@@ -45,6 +45,8 @@ if process.type is 'browser'
   # recalculate the timeout in browser process.
   global.setTimeout = wrapWithActivateUvLoop timers.setTimeout
   global.setInterval = wrapWithActivateUvLoop timers.setInterval
+  global.setImmediate = wrapWithActivateUvLoop timers.setImmediate
+  global.clearImmediate = wrapWithActivateUvLoop timers.clearImmediate
 else
   # There are no setImmediate under renderer process by default, so we need to
   # manually setup them here.