diff --git a/shell/ChangeLog b/shell/ChangeLog
index 405f6920ff..5c2b86fa16 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-15  Michael Meeks  <michael@helixcode.com>
+
+	* e-shell.c (e_shell_component_maybe_crashed): de-register
+	a component's UI if it dies.
+
 2000-11-25  Peter Williams  <peterw@helixcode.com>
 
 	* Makefile.am (idldir): Install our IDL's into $(datadir)/idl.
diff --git a/shell/e-shell.c b/shell/e-shell.c
index b067514226..a577635bb1 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -1160,6 +1160,11 @@ e_shell_component_maybe_crashed   (EShell *shell,
 		  _("Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
 		    "This probably means that the %s component has crashed."),
 		  uri, type_name);
+
+	if (shell_view)
+		bonobo_window_deregister_dead_components (BONOBO_WINDOW (shell_view));
+
+	/* FIXME: we should probably re-start the component here */
 }