feature #2909: Fix accordion back button