diff --git a/basis/x11/unix/authors.txt b/basis/x11/io/unix/authors.txt
similarity index 100%
rename from basis/x11/unix/authors.txt
rename to basis/x11/io/unix/authors.txt
diff --git a/basis/x11/unix/unix.factor b/basis/x11/io/unix/unix.factor
similarity index 73%
rename from basis/x11/unix/unix.factor
rename to basis/x11/io/unix/unix.factor
index 8e3fc347a6..821beb91a5 100644
--- a/basis/x11/unix/unix.factor
+++ b/basis/x11/io/unix/unix.factor
@@ -2,8 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: io.backend.unix io.backend.unix.multiplexers
 namespaces system x11 x11.xlib x11.io
-accessors threads sequences ;
-IN: x11.unix
+accessors threads sequences kernel ;
+IN: x11.io.unix
 
 SYMBOL: dpy-fd
 
@@ -12,4 +12,4 @@ M: unix init-x-io dpy get XConnectionNumber <fd> dpy-fd set-global ;
 M: unix wait-for-display dpy-fd get +input+ wait-for-fd ;
 
 M: unix awaken-event-loop
-    dpy-fd get fd>> mx get remove-input-callbacks [ resume ] each ;
\ No newline at end of file
+    dpy-fd get [ fd>> mx get remove-input-callbacks [ resume ] each ] when* ;
\ No newline at end of file
diff --git a/basis/x11/x11.factor b/basis/x11/x11.factor
index bbda90aa3e..09328c6f6e 100644
--- a/basis/x11/x11.factor
+++ b/basis/x11/x11.factor
@@ -33,4 +33,4 @@ SYMBOL: root
 : with-x ( display-string quot -- )
     [ init-x ] dip [ close-x ] [ ] cleanup ; inline
 
-"io.backend.unix" vocab [ "x11.unix" require ] when
\ No newline at end of file
+"io.backend.unix" vocab [ "x11.io.unix" require ] when
\ No newline at end of file