diff --git a/library/ui/gadgets.factor b/library/ui/gadgets.factor
index d9f3a91312..c6ba378bd8 100644
--- a/library/ui/gadgets.factor
+++ b/library/ui/gadgets.factor
@@ -96,3 +96,8 @@ M: gadget gadget-help drop f ;
 
 : with-gadget ( gadget quot -- )
     [ swap gadget set call ] with-scope ; inline
+
+! Title bar protocol
+GENERIC: gadget-title ( gadget -- string )
+
+M: gadget gadget-title drop "Factor" <model> ;
diff --git a/library/ui/ui.factor b/library/ui/ui.factor
index 7063b2820a..8b35ca762f 100644
--- a/library/ui/ui.factor
+++ b/library/ui/ui.factor
@@ -53,12 +53,6 @@ SYMBOL: windows
 
 : <status-bar> ( -- gadget ) "" <label> dup highlight-theme ;
 
-GENERIC: gadget-title ( gadget -- string )
-
-M: gadget gadget-title drop "Factor" <model> ;
-
-M: world gadget-title world-gadget gadget-title ;
-
 TUPLE: titled-gadget title ;
 
 M: titled-gadget gadget-title titled-gadget-title ;
@@ -76,7 +70,6 @@ C: titled-gadget ( gadget title -- )
 : open-window ( gadget -- )
     <world> dup init-status
     dup pref-dim over set-gadget-dim
-    dup world-gadget gadget-title over set-world-title
     dup open-window*
     draw-world ;
 
diff --git a/library/ui/world.factor b/library/ui/world.factor
index 58cdbe1d92..2b4ed7d42d 100644
--- a/library/ui/world.factor
+++ b/library/ui/world.factor
@@ -23,13 +23,13 @@ TUPLE: world gadget title status focus focused? fonts handle loc ;
 DEFER: request-focus
 
 C: world ( gadget -- world )
-    f <model> over set-world-title
     f <model> over set-world-status
+    [ >r dup gadget-title r> set-world-title ] keep
     { { f set-world-gadget f @center } } make-frame*
     t over set-gadget-root?
     H{ } clone over set-world-fonts
-    dup world-gadget request-focus
-    { 0 0 } over set-world-loc ;
+    { 0 0 } over set-world-loc
+    dup world-gadget request-focus ;
 
 : find-world [ world? ] find-parent ;
 
@@ -63,3 +63,5 @@ M: world model-changed ( world -- )
 
 : draw-string ( font string -- )
     >r world get font-sprites first2 r> (draw-string) ;
+
+M: world gadget-title world-gadget gadget-title ;
diff --git a/library/ui/x11/ui.factor b/library/ui/x11/ui.factor
index 641dbde14b..ca154a3586 100644
--- a/library/ui/x11/ui.factor
+++ b/library/ui/x11/ui.factor
@@ -132,8 +132,9 @@ IN: gadgets
     world-handle first dpy get -rot swap XStoreName drop ;
 
 : open-window* ( world -- )
-    dup gadget-window dup start-world
-    world-handle first map-window* ;
+    dup gadget-window
+    dup start-world
+    world-handle first dup set-closable map-window ;
 
 : raise-window ( world -- )
     dpy get swap world-handle first XRaiseWindow drop ;
diff --git a/library/ui/x11/windows.factor b/library/ui/x11/windows.factor
index 61b05168d7..3360363340 100644
--- a/library/ui/x11/windows.factor
+++ b/library/ui/x11/windows.factor
@@ -60,6 +60,4 @@ USING: alien gadgets hashtables kernel math namespaces sequences ;
 
 : map-window ( win -- ) dpy get swap XMapWindow drop ;
 
-: map-window* ( world win -- ) dup set-closable map-window ;
-
 : unmap-window ( win -- ) dpy get swap XUnmapWindow drop ;