Index: Tomboy/NoteWindow.cs
===================================================================
--- Tomboy/NoteWindow.cs	(revision 1617)
+++ Tomboy/NoteWindow.cs	(working copy)
@@ -275,6 +275,10 @@
 			get { return text_menu; }
 		}
 
+		public Gtk.AccelGroup AccelGroup {
+			get { return accel_group; }
+		}
+
 		// 
 		// Sensitize the Link toolbar button on text selection
 		//
Index: Tomboy/Addins/InsertTimestamp/InsertTimestampNoteAddin.cs
===================================================================
--- Tomboy/Addins/InsertTimestamp/InsertTimestampNoteAddin.cs	(revision 1617)
+++ Tomboy/Addins/InsertTimestamp/InsertTimestampNoteAddin.cs	(working copy)
@@ -13,20 +13,25 @@
 		
 		public override void Initialize ()
 		{
-			item = new Gtk.MenuItem (
-					Catalog.GetString ("Insert Timestamp"));
-			item.Activated += OnMenuItemActivated;
-			item.Show ();
-			AddPluginMenuItem (item);
 		}
 		
 		public override void Shutdown ()
 		{
-			item.Activated -= OnMenuItemActivated;
+			if (item != null)
+				item.Activated -= OnMenuItemActivated;
 		}
 		
 		public override void OnNoteOpened ()
 		{
+			// Add the menu item when the window is created
+			item = new Gtk.MenuItem (
+				Catalog.GetString ("Insert Timestamp"));
+			item.Activated += OnMenuItemActivated;
+			item.AddAccelerator ("activate", Window.AccelGroup,
+				(uint) Gdk.Key.d, Gdk.ModifierType.ControlMask,
+				Gtk.AccelFlags.Visible);
+			item.Show ();
+			AddPluginMenuItem (item);
 		}
 		
 		void OnMenuItemActivated (object sender, EventArgs args)
