Merge branch 'new-question-flow-p2' of https://github.com/metabase/metabase...

Merge branch 'new-question-flow-p2' of https://github.com/metabase/metabase into nqf-search-arrow-keys

frontend/src/metabase/new_query/containers/NewQueryOptions.jsx

@@ -74,7 +74,7 @@ export class NewQueryOptions extends Component {
     render() {
         const { query, metadata, metadataFetched, isAdmin, metricSearchUrl, segmentSearchUrl } = this.props
 
-        if (!query || !metadataFetched.metrics || !metadataFetched.segments) {
+        if (!query || (!isAdmin && (!metadataFetched.metrics || !metadataFetched.segments))) {
             return <LoadingAndErrorWrapper loading={true}/>
         }