diff --git a/src/components/ModalsContainer/BlueprintModal/Body/Toolbar/index.tsx b/src/components/ModalsContainer/BlueprintModal/Body/Toolbar/index.tsx
index 0de53a452..f762b16b1 100644
--- a/src/components/ModalsContainer/BlueprintModal/Body/Toolbar/index.tsx
+++ b/src/components/ModalsContainer/BlueprintModal/Body/Toolbar/index.tsx
@@ -15,7 +15,7 @@ export const Toolbar = ({ onCreateNew }: Props) => (
       <IconWrapper>
         <AddContentIcon />
       </IconWrapper>
-      <Text>Add Item</Text>
+      <Text>Add Type</Text>
     </ActionButton>
   </Wrapper>
 )
diff --git a/src/components/ModalsContainer/BlueprintModal/Body/index.tsx b/src/components/ModalsContainer/BlueprintModal/Body/index.tsx
index d816d3065..b7c6743a2 100644
--- a/src/components/ModalsContainer/BlueprintModal/Body/index.tsx
+++ b/src/components/ModalsContainer/BlueprintModal/Body/index.tsx
@@ -113,7 +113,12 @@ export const Body = () => {
     <>
       <Flex align="stretch" direction="row" grow={1}>
         <Flex ml={-20} my={-20}>
-          <Toolbar onCreateNew={() => setIsCreateNew(true)} />
+          <Toolbar
+            onCreateNew={() => {
+              setIsCreateNew(true)
+              setSelectedSchemaId('')
+            }}
+          />
         </Flex>
         <Flex>
           {selectedSchema || isCreateNew ? (