--- GTG/taskbrowser/current-browser.py	2010-08-28 09:34:11.175923275 +0200
+++ GTG/taskbrowser/browser.py	2010-08-28 09:39:59.554749485 +0200
@@ -157,6 +157,8 @@
         self._init_tag_list()
         self._init_tag_completion()
 
+        self.last_added_tags = None
+
 ### INIT HELPER FUNCTIONS #####################################################
 #
     def _init_browser_config(self):
@@ -1611,7 +1613,12 @@
             # We don't want to reset the text entry and checkbox if we got
             # sent back here after a warning.
             if not tryagain:
-                tag_entry.set_text("NewTag")
+                if self.last_added_tags is None:
+                    default_tag = "NewTag"
+                else:
+                    default_tag = self.last_added_tags
+
+                tag_entry.set_text(default_tag)
                 apply_to_subtasks.set_active(False)
                 tag_entry.set_completion(self.tag_completion)
             tag_entry.grab_focus()
@@ -1633,6 +1640,8 @@
         if not entry_text[0]:
             error_message = "Please enter a tag name."
             addtag_error = True
+
+        self.last_added_tags = entry_text[0]
  
         new_tags = []
         if "," in entry_text[0]: