diff --git a/packages/studio-ui/src/web/actions/index.ts b/packages/studio-ui/src/web/actions/index.ts
index b44ed801..faf046b5 100644
--- a/packages/studio-ui/src/web/actions/index.ts
+++ b/packages/studio-ui/src/web/actions/index.ts
@@ -293,7 +293,7 @@ export const receiveContentItem = createAction('CONTENT/ITEMS/RECEIVE_ONE')
 export const fetchContentItem =
   (id: string, { force = false, batched = false } = {}) =>
   (dispatch, getState): Promise<sdk.ContentElement> => {
-    if (!force && getState().content.itemsById[id]) {
+    if (!id || (!force && getState().content.itemsById[id])) {
       return Promise.resolve(getState().content.itemsById[id])
     }
 
diff --git a/packages/studio-ui/src/web/components/Content/Select/index.tsx b/packages/studio-ui/src/web/components/Content/Select/index.tsx
index 671f0913..a1763a47 100644
--- a/packages/studio-ui/src/web/components/Content/Select/index.tsx
+++ b/packages/studio-ui/src/web/components/Content/Select/index.tsx
@@ -59,7 +59,7 @@ class SelectContent extends Component<Props, State> {
       show: true,
       contentType,
       activeItemIndex: 0,
-      step: FormSteps.INITIAL,
+      step: contentType ? FormSteps.MAIN : FormSteps.INITIAL,
       newItemCategory: null,
       searchTerm: '',
       newItemData: null