diff -u tomboy-1.1.0/debian/changelog tomboy-1.1.0/debian/changelog
--- tomboy-1.1.0/debian/changelog
+++ tomboy-1.1.0/debian/changelog
@@ -1,4 +1,13 @@
-tomboy (1.1.0-0ubuntu3) karmic; urgency=low
+tomboy (1.1.0-0ubuntu4) karmic; urgency=low
+
+  *  debian/patches/04_app_indicator.patch
+     - Don't open the search window on start, it should behave the same as 
+       without using the appindicator
+     - Don't quit tomboy when closing the search window (LP: #503037)
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 07 Jan 2010 16:09:13 -0500
+
+tomboy (1.1.0-0ubuntu3) lucid; urgency=low
 
   * debian/control:
     - Added Depends for libappindicator0-cil (>= 0.0.6)
diff -u tomboy-1.1.0/debian/patches/04_app_indicator.patch tomboy-1.1.0/debian/patches/04_app_indicator.patch
--- tomboy-1.1.0/debian/patches/04_app_indicator.patch
+++ tomboy-1.1.0/debian/patches/04_app_indicator.patch
@@ -1,17 +1,17 @@
 Description: Adds support for rendering menus in the application
  indicator.
  .
- This patch moves tomboy out of the notification area, and into 
+ This patch moves tomboy out of the notification area, and into
  the indicator-applet using libappindicator.
 
 Forwarded: Not forwarded yet
 Author: Jason Smith <jason.smith@canonical.com>
 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/tomboy/+bug/497058
-Last-Update: 2009-12-17
+Last-Update: 2010-01-07
 
 === modified file 'Tomboy/Makefile.am'
---- old/Tomboy/Makefile.am	2009-12-17 19:12:32 +0000
-+++ new/Tomboy/Makefile.am	2009-12-17 19:39:25 +0000
+--- old/Tomboy/Makefile.am	2010-01-07 16:43:35 +0000
++++ new/Tomboy/Makefile.am	2010-01-07 17:33:42 +0000
 @@ -119,6 +119,7 @@
  	$(srcdir)/Tag.cs			\
  	$(srcdir)/TagButton.cs			\
@@ -29,9 +29,31 @@
  	-r:Mono.Posix	\
  	$(DBUS_LIBS)	\
 
+=== modified file 'Tomboy/RecentChanges.cs'
+--- old/Tomboy/RecentChanges.cs	2010-01-07 16:43:35 +0000
++++ new/Tomboy/RecentChanges.cs	2010-01-07 20:31:00 +0000
+@@ -222,7 +222,7 @@
+ 			am ["NewNotebookAction"].Activated += OnNewNotebook;
+ 			am ["DeleteNotebookAction"].Activated += OnDeleteNotebook;
+ 			am ["CloseWindowAction"].Activated += OnCloseWindow;
+-			if (Tomboy.TrayIconShowing == false)
++			if (Tomboy.TrayIconShowing == false && !TomboyIndicatorTray.IndicatorTrayPresent)
+ 				am ["CloseWindowAction"].Visible = false;
+ 
+ 			// Allow Escape to close the window as well as <Control>W
+@@ -995,7 +995,7 @@
+ 			Destroy ();
+ 			instance = null;
+ #if !MAC
+-			if (Tomboy.TrayIconShowing == false)
++			if (Tomboy.TrayIconShowing == false && !TomboyIndicatorTray.IndicatorTrayPresent)
+ 				Tomboy.ActionManager ["QuitTomboyAction"].Activate ();
+ #endif
+ 		}
+
 === modified file 'Tomboy/Tomboy.cs'
---- old/Tomboy/Tomboy.cs	2009-12-17 19:12:32 +0000
-+++ new/Tomboy/Tomboy.cs	2009-12-17 19:28:41 +0000
+--- old/Tomboy/Tomboy.cs	2010-01-07 16:43:35 +0000
++++ new/Tomboy/Tomboy.cs	2010-01-07 20:48:10 +0000
 @@ -163,17 +163,22 @@
  #endif
  		}
@@ -64,10 +86,19 @@
  
  			StartMainLoop ();
  		}
+@@ -187,7 +192,7 @@
+ 			// instead, launch the Search All Notes window so the user can
+ 			// can still use Tomboy.
+ #if !MAC
+-			if (tray_icon_showing == false)
++			if (tray_icon_showing == false && indicator != null)
+ 				ActionManager ["ShowSearchAllNotesAction"].Activate ();
+ #endif
+ 			
 
 === added file 'Tomboy/TomboyIndicatorTray.cs'
 --- old/Tomboy/TomboyIndicatorTray.cs	1970-01-01 00:00:00 +0000
-+++ new/Tomboy/TomboyIndicatorTray.cs	2009-12-17 20:58:58 +0000
++++ new/Tomboy/TomboyIndicatorTray.cs	2010-01-07 17:33:42 +0000
 @@ -0,0 +1,129 @@
 +//  
 +//  Copyright (C) 2009 GNOME Do
@@ -200,8 +231,8 @@
 +}
 
 === modified file 'configure.in'
---- old/configure.in	2009-12-17 19:12:32 +0000
-+++ new/configure.in	2009-12-17 19:28:41 +0000
+--- old/configure.in	2010-01-07 16:43:35 +0000
++++ new/configure.in	2010-01-07 17:33:42 +0000
 @@ -200,6 +200,10 @@
  		  gtk-sharp-2.0 >= $GTKSHARP2_MINIMUM_VERSION)
  AC_SUBST(GTKSHARP_LIBS)