diff --git a/supabase-ui/src/components/Select/Select.js b/supabase-ui/src/components/Select/Select.js
index ecfef32736e..2f19375df2e 100644
--- a/supabase-ui/src/components/Select/Select.js
+++ b/supabase-ui/src/components/Select/Select.js
@@ -2,7 +2,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import './Select.css'
 
-const Textarea = ({
+const Select = ({
   className = '',
   isError = false,
   children,
@@ -24,9 +24,9 @@ const Textarea = ({
   )
 }
 
-Textarea.propTypes = {
+Select.propTypes = {
   isError: PropTypes.bool,
   className: PropTypes.string,
 }
 
-export default Textarea
+export default Select
diff --git a/supabase-ui/src/index.js b/supabase-ui/src/index.js
index 7c7db568b5d..a47a8dab06a 100644
--- a/supabase-ui/src/index.js
+++ b/supabase-ui/src/index.js
@@ -1,2 +1,9 @@
 export * from './components/Button/index'
 export * from './components/Toggle/index'
+
+// FORM
+export * from './components/Checkbox/index'
+export * from './components/Input/index'
+export * from './components/Radio/index'
+export * from './components/Select/index'
+export * from './components/Textarea/index'