diff --git a/openjdk/sun/nio/ch/DotNetSelectorImpl.java b/openjdk/sun/nio/ch/DotNetSelectorImpl.java
index ab6c1bb9..47ae5d3d 100644
--- a/openjdk/sun/nio/ch/DotNetSelectorImpl.java
+++ b/openjdk/sun/nio/ch/DotNetSelectorImpl.java
@@ -129,7 +129,8 @@ final class DotNetSelectorImpl extends SelectorImpl
 	    try
 	    {
 		if (false) throw new SocketException();
-		Socket.Select(read, write, error, microSeconds);
+		// FXBUG docs say that -1 is infinite timeout, but that doesn't appear to work
+		Socket.Select(read, write, error, timeout < 0 ? Integer.MAX_VALUE : microSeconds);
 	    }
 	    catch (SocketException _)
 	    {