FIX: Issue with subscription dialog and overlays