Diagrams (with overview fix)

Fixes an issue where the diagram did not render properly when navigating to it via the overview using the keyboard.