diff --git a/src/views/components/BaseOptionPicker.jsx b/src/views/components/BaseOptionPicker.jsx
index c176020..bac0434 100644
--- a/src/views/components/BaseOptionPicker.jsx
+++ b/src/views/components/BaseOptionPicker.jsx
@@ -23,6 +23,7 @@ const BaseOptionPicker = ({
   getItemColor,
   getTriggerText,
   onClear,
+  menuFooter,
 }) => {
   const [isOpen, setIsOpen] = useState(false)
   const buttonRef = useRef(null)
@@ -242,6 +243,9 @@ const BaseOptionPicker = ({
                   </Button>
                 )
               })}
+              {menuFooter && (
+                <Box sx={{ mt: items.length > 0 ? 0.5 : 0 }}>{menuFooter}</Box>
+              )}
             </Sheet>
           </ClickAwayListener>
         </Popper>
diff --git a/src/views/components/LabelsPickerField.jsx b/src/views/components/LabelsPickerField.jsx
index bf74602..ff27a4a 100644
--- a/src/views/components/LabelsPickerField.jsx
+++ b/src/views/components/LabelsPickerField.jsx
@@ -1,4 +1,7 @@
-import { Label } from '@mui/icons-material'
+import { Add, Label } from '@mui/icons-material'
+import { Button } from '@mui/joy'
+import { useState } from 'react'
+import LabelModal from '../Modals/Inputs/LabelModal'
 import BaseOptionPicker from './BaseOptionPicker'
 
 const LabelsPickerField = ({
@@ -8,6 +11,8 @@ const LabelsPickerField = ({
   labels = [],
   emptyDisplay = 'icon-text',
 }) => {
+  const [createOpen, setCreateOpen] = useState(false)
+
   const options = labels.map(label => ({
     id: label.id,
     name: label.name,
@@ -15,33 +20,55 @@ const LabelsPickerField = ({
   }))
 
   return (
-    <BaseOptionPicker
-      items={options}
-      multiple
-      values={values}
-      onValuesChange={onChange}
-      onClear={onClear}
-      emptyDisplay={emptyDisplay}
-      emptyLabel='Labels'
-      getItemValue={item => item.id}
-      getItemLabel={item => item.name}
-      getItemColor={item => item.color}
-      renderTriggerIcon={() => <Label sx={{ fontSize: '20px' }} />}
-      renderItemStart={({ item }) => (
-        <Label
-          sx={{
-            fontSize: '18px',
-            color: item.color || 'text.secondary',
-          }}
-        />
-      )}
-      getTriggerText={({ selectedItems, isEmpty }) => {
-        if (isEmpty) return 'Labels'
-        if (selectedItems.length === 1) return selectedItems[0].name
-        return `${selectedItems.length} labels`
-      }}
-      menuMinWidth={220}
-    />
+    <>
+      <BaseOptionPicker
+        items={options}
+        multiple
+        values={values}
+        onValuesChange={onChange}
+        onClear={onClear}
+        emptyDisplay={emptyDisplay}
+        emptyLabel='Labels'
+        getItemValue={item => item.id}
+        getItemLabel={item => item.name}
+        getItemColor={item => item.color}
+        renderTriggerIcon={() => <Label sx={{ fontSize: '20px' }} />}
+        renderItemStart={({ item }) => (
+          <Label
+            sx={{
+              fontSize: '18px',
+              color: item.color || 'text.secondary',
+            }}
+          />
+        )}
+        getTriggerText={({ selectedItems, isEmpty }) => {
+          if (isEmpty) return 'Labels'
+          if (selectedItems.length === 1) return selectedItems[0].name
+          return `${selectedItems.length} labels`
+        }}
+        menuMinWidth={220}
+        menuFooter={
+          <Button
+            size='sm'
+            variant='plain'
+            color='neutral'
+            startDecorator={<Add sx={{ fontSize: '16px' }} />}
+            onClick={e => {
+              e.stopPropagation()
+              setCreateOpen(true)
+            }}
+            sx={{ width: '100%', justifyContent: 'flex-start' }}
+          >
+            Create label
+          </Button>
+        }
+      />
+      <LabelModal
+        isOpen={createOpen}
+        onClose={() => setCreateOpen(false)}
+        label={null}
+      />
+    </>
   )
 }