Comment 2 for bug 313260

and here is the patch file that fixes it.
Takes into consideration new 'onclick' attribute as well as removes empty options associated with image thumbnails.

Hope this helps :-)