diff --git a/library/ui/hand.factor b/library/ui/hand.factor
index 76f36167bf..7487c63613 100644
--- a/library/ui/hand.factor
+++ b/library/ui/hand.factor
@@ -112,3 +112,10 @@ V{ } clone hand-buttons set-global
 : layout-queued ( -- )
     invalid dup queue-empty?
     [ drop ] [ deque dup layout repaint layout-queued ] if ;
+
+: close-world ( world -- )
+    dup world-handle select-gl-context
+    f over request-focus*
+    dup remove-notify
+    dup free-fonts
+    f swap set-world-handle ;
diff --git a/library/ui/world.factor b/library/ui/world.factor
index 16ba82e401..839ef6ad77 100644
--- a/library/ui/world.factor
+++ b/library/ui/world.factor
@@ -18,13 +18,6 @@ TUPLE: world glass status focus fonts handle ;
 : font-sprites ( font world -- sprites )
     world-fonts [ drop V{ } clone ] cache ;
 
-: close-world ( world -- )
-    dup world-handle select-gl-context
-    f over request-focus*
-    dup remove-notify
-    dup free-fonts
-    f swap set-world-handle ;
-
 C: world ( gadget status dim -- world )
     <stack> over set-delegate
     t over set-gadget-root?