FIX: Fixed blue-on-click behaviour