diff --git a/ChangeLog b/ChangeLog
index 14c88d9..e22645a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2330,3 +2330,8 @@ Fri Aug 20 17:28:24 PDT 1999	Michael Jennings <mej@eterm.org>
 	<hubertv@bigfoot.com>.
 	
 -------------------------------------------------------------------------------
+Mon Aug 23 10:33:20 PDT 1999	Michael Jennings <mej@eterm.org>
+
+	Fixed a bug where Eterm wouldn't start handling events soon enough.
+	
+-------------------------------------------------------------------------------
diff --git a/src/windows.c b/src/windows.c
index b3c704d..2383b44 100644
--- a/src/windows.c
+++ b/src/windows.c
@@ -431,9 +431,18 @@ Create_Windows(int argc, char *argv[])
     val = rs_desktop;
     XChangeProperty(Xdisplay, TermWin.parent, prop, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &val, 1);
   }
+
+  /* We're done creating our windows.  Now let's initialize the event subsystem to handle them. */
+  event_init_subsystem((event_dispatcher_t) process_x_event, (event_dispatcher_init_t) event_init_primary_dispatcher);
+
+  /* Time for the scrollbar to create its windows and add itself to the event subsystem. */
+  scrollbar_init();
+
+  /* Same for the menu subsystem. */
+  menu_init();
+
   XMapWindow(Xdisplay, TermWin.vt);
   XMapWindow(Xdisplay, TermWin.parent);
-
   XSetWindowBackground(Xdisplay, TermWin.vt, PixColors[bgColor]);
   XClearWindow(Xdisplay, TermWin.vt);
 
@@ -457,15 +466,6 @@ Create_Windows(int argc, char *argv[])
   if (Options & Opt_noCursor)
     scr_cursor_visible(0);
 
-  /* We're done creating our windows.  Now let's initialize the event subsystem to handle them. */
-  event_init_subsystem((event_dispatcher_t) process_x_event, (event_dispatcher_init_t) event_init_primary_dispatcher);
-
-  /* Time for the scrollbar to create its windows and add itself to the event subsystem. */
-  scrollbar_init();
-
-  /* Same for the menu subsystem. */
-  menu_init();
-
 }
 
 /* window resizing - assuming the parent window is the correct size */