diff --git a/src/core/json-schema-components.jsx b/src/core/json-schema-components.jsx
index 47a1981099e..8700d5c69ec 100644
--- a/src/core/json-schema-components.jsx
+++ b/src/core/json-schema-components.jsx
@@ -181,7 +181,7 @@ export class JsonSchema_array extends PureComponent {
     const schemaItemsEnum = schema.getIn(["items", "enum"])
     const schemaItemsType = schema.getIn(["items", "type"])
     const schemaItemsFormat = schema.getIn(["items", "format"])
-    const schemaItemsSchema = schema.getIn(["items", "schema"])
+    const schemaItemsSchema = schema.get("items")
     let ArrayItemsComponent
     let isArrayItemText = false
     let isArrayItemFile = (schemaItemsType === "file" || (schemaItemsType === "string" && schemaItemsFormat === "binary")) ? true : false
@@ -264,7 +264,7 @@ export class JsonSchema_array extends PureComponent {
             title={arrayErrors.length ? arrayErrors : ""}
             onClick={this.addItem}
           >
-            Add item
+            Add {schemaItemsType ? `${schemaItemsType} ` : ""}item
           </Button>
         ) : null}
       </div>