diff --git a/src/com/limelight/input/EvdevLoader.java b/src/com/limelight/input/EvdevLoader.java
index a4ddff8..c8ee221 100644
--- a/src/com/limelight/input/EvdevLoader.java
+++ b/src/com/limelight/input/EvdevLoader.java
@@ -90,14 +90,16 @@ public class EvdevLoader implements Runnable {
 			WatchService watcher = evdev.getFileSystem().newWatchService();
 			evdev.register(watcher, StandardWatchEventKinds.ENTRY_CREATE);
 			
-			WatchKey watckKey = watcher.take();
-			List<WatchEvent<?>> events = watckKey.pollEvents();
-			for (WatchEvent event:events) {
-				if (event.kind() == StandardWatchEventKinds.ENTRY_CREATE) {
-					String name = event.context().toString();
-					if (filter.accept(input, name)) {
-						LimeLog.info("Input " + name + " added");
-						new EvdevHandler(conn, new File(input, name).getAbsolutePath(), mapping).start();
+			for (;;) {
+				WatchKey watckKey = watcher.take();
+				List<WatchEvent<?>> events = watckKey.pollEvents();
+				for (WatchEvent event:events) {
+					if (event.kind() == StandardWatchEventKinds.ENTRY_CREATE) {
+						String name = event.context().toString();
+						if (filter.accept(input, name)) {
+							LimeLog.info("Input " + name + " added");
+							new EvdevHandler(conn, new File(input, name).getAbsolutePath(), mapping).start();
+						}
 					}
 				}
 			}