diff --git a/campcaster/src/products/gLiveSupport/src/ScratchpadWindow.cxx b/campcaster/src/products/gLiveSupport/src/ScratchpadWindow.cxx
index bd2426ade..34dec7cc1 100644
--- a/campcaster/src/products/gLiveSupport/src/ScratchpadWindow.cxx
+++ b/campcaster/src/products/gLiveSupport/src/ScratchpadWindow.cxx
@@ -38,7 +38,6 @@
 
 #include "LiveSupport/Widgets/WidgetFactory.h"
 #include "LiveSupport/Widgets/ZebraTreeView.h"
-#include "SchedulePlaylistWindow.h"
 
 #include "ScratchpadWindow.h"
 
@@ -492,14 +491,12 @@ ScratchpadWindow :: onSchedulePlaylist(void)                    throw ()
         return;
     }
     
-    // TODO: this should be somewhere else; figure out where
-    Ptr<SchedulePlaylistWindow>::Ref    scheduleWindow;
-    scheduleWindow.reset(new SchedulePlaylistWindow(gLiveSupport,
-                                                    bundle,
-                                                    0, /* no button */
-                                                    playlist));
+    schedulePlaylistWindow.reset(new SchedulePlaylistWindow(gLiveSupport,
+                                                            bundle,
+                                                            0, /* no button */
+                                                            playlist));
 
-    Gtk::Main::run(*scheduleWindow);
+    Gtk::Main::run(*schedulePlaylistWindow);
 }
 
 
@@ -749,6 +746,9 @@ ScratchpadWindow :: on_hide(void)                               throw ()
     if (exportPlaylistWindow) {
         exportPlaylistWindow->hide();
     }
+    if (schedulePlaylistWindow) {
+        schedulePlaylistWindow->hide();
+    }
         
     GuiWindow::on_hide();
 }
diff --git a/campcaster/src/products/gLiveSupport/src/ScratchpadWindow.h b/campcaster/src/products/gLiveSupport/src/ScratchpadWindow.h
index e32add8e0..d05da1644 100644
--- a/campcaster/src/products/gLiveSupport/src/ScratchpadWindow.h
+++ b/campcaster/src/products/gLiveSupport/src/ScratchpadWindow.h
@@ -54,6 +54,7 @@
 #include "GuiWindow.h"
 #include "ContentsStorable.h"
 #include "ExportPlaylistWindow.h"
+#include "SchedulePlaylistWindow.h"
 
 namespace LiveSupport {
 namespace GLiveSupport {
@@ -85,6 +86,11 @@ class ScratchpadWindow : public GuiWindow,
          */
         Ptr<ExportPlaylistWindow>::Ref      exportPlaylistWindow;
 
+        /**
+         *  The Schedule Playlist pop-up window.
+         */
+        Ptr<SchedulePlaylistWindow>::Ref    schedulePlaylistWindow;
+
         /**
          *  Check whether exactly one row is selected, and if so, set
          *  the currentRow variable to point to it.