diff --git a/bin/mac/TestCafe Browser Tools.app/Contents/MacOS/testcafe-browser-tools b/bin/mac/TestCafe Browser Tools.app/Contents/MacOS/testcafe-browser-tools
index 97299e0..17fdb83 100755
Binary files a/bin/mac/TestCafe Browser Tools.app/Contents/MacOS/testcafe-browser-tools and b/bin/mac/TestCafe Browser Tools.app/Contents/MacOS/testcafe-browser-tools differ
diff --git a/bin/mac/main b/bin/mac/main
index 3797650..b8cfee9 100755
Binary files a/bin/mac/main and b/bin/mac/main differ
diff --git a/src/natives/utils/mac/utils.m b/src/natives/utils/mac/utils.m
index f9e0b55..0b6520c 100644
--- a/src/natives/utils/mac/utils.m
+++ b/src/natives/utils/mac/utils.m
@@ -9,21 +9,18 @@ id getApplicationForProcess (NSString *processId) {
 }
 
 id getWindowOfApplication (id app, NSString *windowId) {
-    id windows            = [app windows];
-    id windowsProperties  = [windows arrayByApplyingSelector:@selector(properties)];
+    id windows = [app windows];
 
-    NSUInteger index = [windowsProperties indexOfObjectPassingTest:^(NSDictionary *properties, NSUInteger index, BOOL *stop){ 
-        return [[properties[@"id"] stringValue] isEqualToString: windowId];
-    }];
+    for (id window in windows) {
+        if ([[window properties][@"id"] intValue] == [windowId intValue])
+            return window;
+    }
 
-    if (index == NSNotFound)
-        return nil;
-            
-    return windows[index];
+    return nil;
 }
 
 id getWindowOfProcess (NSString *processId, NSString *windowId) {
     id app = getApplicationForProcess(processId);
 
     return getWindowOfApplication(app, windowId);    
-}    
+}