diff --git a/browser/browser.py b/browser/browser.py
index a10ad3d5..60054363 100755
--- a/browser/browser.py
+++ b/browser/browser.py
@@ -170,13 +170,21 @@ class AddressEntry(gtk.HBox):
 			image.show()
 
 			self.entry.show()
-			
-	def __button_clicked_cb(self, button):
+			self.entry.grab_focus()
+	
+	def get_folded(self):
+		return self.folded
+	
+	def set_folded(self, folded):
 		self.folded = not self.folded
-		self._update_folded_state()
+		self._update_folded_state()		
+	
+	def __button_clicked_cb(self, button):
+		self.set_folded(not self.get_folded())
 
 	def __activate_cb(self, entry):
 		self.callback(entry.get_text())
+		self.set_folded(True)
 
 class NavigationToolbar(gtk.Toolbar):
 	def __init__(self, embed):