[ticket/243] Improve portal responsiveness

Fixes #243