diff --git a/packages/strapi-admin/admin/src/components/HeadersInput/index.js b/packages/strapi-admin/admin/src/components/HeadersInput/index.js
index bf5f1c2228..6478860619 100644
--- a/packages/strapi-admin/admin/src/components/HeadersInput/index.js
+++ b/packages/strapi-admin/admin/src/components/HeadersInput/index.js
@@ -132,19 +132,16 @@ const HeadersInput = ({ errors, name, onClick, onChange, onRemove, value }) => {
 
 HeadersInput.defaultProps = {
   errors: {},
-  handleClick: () => {},
-  onClick: () => {},
   onRemove: () => {},
 };
 
 HeadersInput.propTypes = {
   errors: PropTypes.object,
-  handleClick: PropTypes.func,
   name: PropTypes.string.isRequired,
   onChange: PropTypes.func.isRequired,
   onClick: PropTypes.func.isRequired,
   onRemove: PropTypes.func,
-  value: PropTypes.array,
+  value: PropTypes.array.isRequired,
 };
 
 export default HeadersInput;
diff --git a/packages/strapi-admin/admin/src/components/HeadersInput/tests/index.test.js b/packages/strapi-admin/admin/src/components/HeadersInput/tests/index.test.js
index 439dd33087..6244d04d42 100644
--- a/packages/strapi-admin/admin/src/components/HeadersInput/tests/index.test.js
+++ b/packages/strapi-admin/admin/src/components/HeadersInput/tests/index.test.js
@@ -1,10 +1,11 @@
 import React from 'react';
 import { shallow } from 'enzyme';
+import CreatableSelect from 'react-select/creatable';
 
+import { InputText } from '@buffetjs/core';
 import { CircleButton } from 'strapi-helper-plugin';
 import HeadersInput from '../index';
 
-
 describe('Admin | components | HeadersInput', () => {
   const props = {
     name: 'headers',
@@ -22,6 +23,12 @@ describe('Admin | components | HeadersInput', () => {
     it('It should render properly', () => {
       shallow(<HeadersInput {...props} />);
     });
+
+    it('It should render as many key/value rows as value', () => {
+      const renderedComponent = shallow(<HeadersInput {...props} />);
+
+      expect(renderedComponent.find(CreatableSelect)).toHaveLength(1);
+    });
   });
 
   describe('Actions', () => {
@@ -31,7 +38,7 @@ describe('Admin | components | HeadersInput', () => {
       const removeButton = renderedComponent.find(CircleButton).at(0);
       removeButton.simulate('click');
 
-      expect(props.onRemove).toHaveBeenCalled();
+      expect(props.onRemove).toHaveBeenCalledWith(0);
     });
   });
 
@@ -43,4 +50,17 @@ describe('Admin | components | HeadersInput', () => {
 
     expect(props.onClick).toHaveBeenCalled();
   });
+
+  it('It should call the onChange props on input text change', () => {
+    const renderedComponent = shallow(<HeadersInput {...props} />);
+
+    const input = renderedComponent.find(InputText).at(0);
+    input.simulate('change');
+
+    expect(props.onChange).toHaveBeenCalled();
+  });
+
+  it('should have default onRemove', () => {
+    expect(HeadersInput.defaultProps.onRemove).toBeDefined();
+  });
 });
diff --git a/packages/strapi-helper-plugin/lib/src/components/LeftMenuList/List.js b/packages/strapi-helper-plugin/lib/src/components/LeftMenuList/List.js
index 8266e7cff0..ab46ba22a1 100644
--- a/packages/strapi-helper-plugin/lib/src/components/LeftMenuList/List.js
+++ b/packages/strapi-helper-plugin/lib/src/components/LeftMenuList/List.js
@@ -6,7 +6,7 @@ const List = styled.ul`
   margin-bottom: 0;
   padding-left: 0;
   max-height: 251px;
-  overflow-y: scroll;
+  overflow-y: auto;
   li {
     position: relative;
     margin-bottom: 2px;