os x - problems with gmail bookmarks/button

[spiff101]

using gmail on my new macbook, with firefox. (first-time mac user) - I find that both my Gmail bookmark and Gmail button on my google toolbar keep searching my gmail rather than taking me straight to the inbox. I think this happens because when I hit Cmd-L to do a search in the location bar, it automatically puts that text in the Google toolbar search box as well. Then hitting either the bookmark or the button does a search.

Is there any way I can get a bookmark and button that always takes me to my inbox? Maybe disabling the google toolbar would do it but I use a couple of it's features quite a lot.