diff --git a/src/glade/grampletpane.glade b/src/glade/grampletpane.glade
index abe5f6eca..33cc63bd3 100644
--- a/src/glade/grampletpane.glade
+++ b/src/glade/grampletpane.glade
@@ -7,16 +7,17 @@
     <child>
       <object class="GtkVBox" id="gvgramplet">
         <property name="visible">True</property>
+        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK</property>
         <child>
           <object class="GtkFrame" id="gvframe">
             <property name="visible">True</property>
+            <property name="events">GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK</property>
             <property name="border_width">10</property>
             <property name="label_xalign">0</property>
             <property name="shadow_type">in</property>
             <child>
               <object class="GtkVBox" id="vbox143">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</property>
                 <child>
                   <placeholder/>
                 </child>
@@ -44,6 +45,7 @@
             <child type="label">
               <object class="GtkHBox" id="hbox144">
                 <property name="visible">True</property>
+                <property name="events">GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK</property>
                 <child>
                   <object class="GtkButton" id="gvproperties">
                     <property name="visible">True</property>
@@ -108,14 +110,12 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="gvtitle">
+                  <object class="GtkButton" id="gvtitle">
+                    <property name="label" translatable="yes">Gramplet</property>
                     <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="yalign">0</property>
-                    <property name="xpad">7</property>
-                    <property name="ypad">9</property>
-                    <property name="label" translatable="yes">&lt;b&gt;&lt;i&gt;Gramplet&lt;/i&gt;&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="relief">none</property>
                   </object>
                   <packing>
                     <property name="position">3</property>
diff --git a/src/gui/widgets/grampletpane.py b/src/gui/widgets/grampletpane.py
index f2f0172a0..05d39e857 100644
--- a/src/gui/widgets/grampletpane.py
+++ b/src/gui/widgets/grampletpane.py
@@ -223,6 +223,8 @@ class GrampletWindow(ManagedWindow.ManagedWindow):
         self.gramplet.gvclose.hide()
         self.gramplet.gvstate.hide()
         self.gramplet.gvproperties.hide()
+        if self.gramplet.titlelabel_entry:
+            self.gramplet.titlelabel_entry.hide()
 
     def handle_response(self, object, response):
         """
@@ -343,8 +345,10 @@ class GuiGramplet(object):
         self.scrolledwindow = self.xml.get_object('gvscrolledwindow')
         self.vboxtop = self.xml.get_object('vboxtop')
         self.titlelabel = self.xml.get_object('gvtitle')
-        self.titlelabel.set_text("<b><i>%s</i></b>" % self.title)
-        self.titlelabel.set_use_markup(True)
+        self.titlelabel.get_children()[0].set_text("<b><i>%s</i></b>" % self.title)
+        self.titlelabel.get_children()[0].set_use_markup(True)
+        self.titlelabel.connect("clicked", self.edit_title)
+        self.titlelabel_entry = None
         self.gvclose = self.xml.get_object('gvclose')
         self.gvclose.connect('clicked', self.close)
         self.gvstate = self.xml.get_object('gvstate')
@@ -364,6 +368,43 @@ class GuiGramplet(object):
                              [GuiGramplet.LOCAL_DRAG_TARGET],
                              gtk.gdk.ACTION_COPY)
 
+    def edit_title(self, widget):
+        """
+        Edit the the title in the GUI.
+        """
+        parent = widget.get_parent()
+        widget.hide()
+        if self.titlelabel_entry is None:
+            self.titlelabel_entry = gtk.Entry()
+            parent = widget.get_parent()
+            parent.pack_end(self.titlelabel_entry)
+            self.titlelabel_entry.connect("focus-out-event", self.edit_title_done)
+            self.titlelabel_entry.connect("activate", self.edit_title_done)
+            self.titlelabel_entry.connect("key-press-event", self.edit_title_keypress)
+        self.titlelabel_entry.set_text(widget.get_children()[0].get_text())
+        self.titlelabel_entry.show()
+        self.titlelabel_entry.grab_focus()
+        return True
+
+    def edit_title_keypress(self, widget, event):
+        """
+        Edit the title, handle escape.
+        """
+        if event.type == gtk.gdk.KEY_PRESS:
+            if event.keyval == gtk.keysyms.Escape:
+                self.titlelabel.show()
+                widget.hide()
+
+    def edit_title_done(self, widget, event=None):
+        """
+        Edit title in GUI, finishing callback.
+        """
+        result = self.set_title(widget.get_text())
+        if result: # if ok to set title to that
+            self.titlelabel.show()
+            widget.hide()
+        return False # Return False for gtk requirement
+
     def close(self, *obj):
         """
         Remove (delete) the gramplet from view. 
@@ -790,12 +831,14 @@ class GuiGramplet(object):
 
     def set_title(self, new_title):
         # can't do it if already titled that way
-        if new_title in self.pane.gramplet_map: return
+        if self.title == new_title: return True
+        if new_title in self.pane.gramplet_map: return False
         del self.pane.gramplet_map[self.title] 
         self.title = new_title
         self.pane.gramplet_map[self.title] = self
-        self.titlelabel.set_text("<b><i>%s</i></b>" % self.title)
-        self.titlelabel.set_use_markup(True)
+        self.titlelabel.get_children()[0].set_text("<b><i>%s</i></b>" % self.title)
+        self.titlelabel.get_children()[0].set_use_markup(True)
+        return True
         
 class GrampletPane(gtk.ScrolledWindow):
     def __init__(self, configfile, pageview, dbstate, uistate, **kwargs):