Index: st2.py
==================================================================
--- st2.py
+++ st2.py
@@ -581,15 +581,19 @@
 
 # aux win: search dialog (keeps search text in self.q)
 # and also: quick search textbox (uses main.q instead)
 class search (auxiliary_window):
 
+        # either current channel, or last channel (avoid searching in bookmarks)
+        current = None
 
         # show search dialog   
         def menu_search(self, w):
             self.search_dialog.show();
-            self.search_dialog_current.set_label("just %s" % main.current_channel)
+            if not self.current or main.current_channel != "bookmarks":
+                self.current = main.current_channel
+                self.search_dialog_current.set_label("just %s" % main.channels[self.current].title)
 
 
         # hide dialog box again
         def cancel(self, *args):
             self.search_dialog.hide()
@@ -602,11 +606,11 @@
             self.cancel()
             self.q = self.search_full.get_text().lower()
             if self.search_dialog_all.get_active():
                 self.targets = main.channels.keys()
             else:
-                self.targets = [main.current_channel]
+                self.targets = [self.current]
             main.bookmarks.streams["search"] = []
             
         # perform search
         def cache_search(self, *w):
             self.prepare_search()