diff --git a/gui/commands.py b/gui/commands.py
index d3f3ce5..3ff8a8a 100644
--- a/gui/commands.py
+++ b/gui/commands.py
@@ -188,7 +188,9 @@ part of the TUI."""
 class DeleteWindowsCommand(gdb.Command):
     """Delete a GUI window.
 Usage: delete window N
-Delete GUI window number N.  The numbers can be found with "info windows"."""
+Delete GUI window number N.
+A window's number appears in its title bar, and can also be
+found using "info windows"."""
 
     def __init__(self):
         super(DeleteWindowsCommand, self).__init__('delete window',
diff --git a/gui/source.py b/gui/source.py
index 1546d6e..5acc0c7 100644
--- a/gui/source.py
+++ b/gui/source.py
@@ -208,6 +208,7 @@ class SourceWindow(Toplevel):
 
         lru_handler.add(self)
 
+        self.window.set_title('GDB Source @%d' % self.number)
         self.window.show()
 
     def deleted(self, widget, event):
@@ -232,6 +233,9 @@ class SourceWindow(Toplevel):
         if buff is not None:
             old_buffer = self.view.get_buffer()
             self.view.set_buffer(buff)
+            # Might be good to let the user pick the format...
+            self.window.set_title('%s - GDB Source @%d'
+                                  % (os.path.basename(srcfile), self.number))
             buffer_manager.release_buffer(old_buffer)
             GObject.idle_add(self._do_scroll, buff, srcline - 1)
             # self.view.scroll_to_iter(buff.get_iter_at_line(srcline), 0.0)