Fix multiple floating toolbar issues

See #98 for details.