Auto-complete for Material-UI imports borked

The auto-complete of JSX tags for Material-UI components is at best flaky.  For instance, I'm adding a <Grid>, and even though Grid is the full name of the class, it's not included in the suggested list of available components.

If I go ahead and complete the tag, it will finally offer me to import Grid, but incorrectly

I don't want to import "@material-ui/core/Grid", but rather

import {Grid} from "@material-ui/core";

Are there any settings I can make or a plugin that can handle this?  It's getting to be pretty annoying.  I am using WebStorm 2019.3.2 and Material-UI 4.9.0.