diff --git a/capplets/screensaver/ChangeLog b/capplets/screensaver/ChangeLog
index c1027e71d..d38f9e60d 100644
--- a/capplets/screensaver/ChangeLog
+++ b/capplets/screensaver/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-10  Bradford Hovinen  <hovinen@helixcode.com>
+
+	* preview.c (show_preview): Map window before showing screensaver
+	(close_preview): Unmap window after killing screensaver
+
 2000-08-09  Bradford Hovinen  <hovinen@helixcode.com>
 
 	* preview.c (setup_path): Use get_screensaver_dir_list; iterate
diff --git a/capplets/screensaver/preview.c b/capplets/screensaver/preview.c
index 4cf9cd745..77fd5d86b 100644
--- a/capplets/screensaver/preview.c
+++ b/capplets/screensaver/preview.c
@@ -199,6 +199,7 @@ show_preview (Screensaver *saver)
 	/* Note: kill this next line for a very interesting effect ... */
 	close_preview ();
 	if (!saver->command_line) return;
+	gtk_widget_map (preview_window);
 	show_screensaver (preview_window->window, saver, &preview_pid);
 	timeout_id =
 		gtk_timeout_add (500, (GtkFunction)
@@ -216,6 +217,7 @@ close_preview (void)
 	if (preview_pid) {
 		kill (preview_pid, SIGTERM);
 		preview_pid = 0;
+		gtk_widget_unmap (preview_window);
 	}
 }