diff --git a/components/CharacterUnit/index.tsx b/components/CharacterUnit/index.tsx
index 05925d14..f2b3964f 100644
--- a/components/CharacterUnit/index.tsx
+++ b/components/CharacterUnit/index.tsx
@@ -1,11 +1,13 @@
 import React, { useEffect, useState } from 'react'
 import { useRouter } from 'next/router'
 import { useSnapshot } from 'valtio'
-import { useTranslation } from 'next-i18next'
+import { Trans, useTranslation } from 'next-i18next'
 import classnames from 'classnames'
 
+import Alert from '~components/Alert'
 import Button from '~components/Button'
 import CharacterHovercard from '~components/CharacterHovercard'
+import CharacterModal from '~components/CharacterModal'
 import {
   ContextMenu,
   ContextMenuTrigger,
@@ -23,6 +25,7 @@ import SettingsIcon from '~public/icons/Settings.svg'
 import type { SearchableObject } from '~types'
 
 import './index.scss'
+import { Dialog } from '~components/Dialog'
 
 interface Props {
   gridCharacter?: GridCharacter
@@ -30,6 +33,7 @@ interface Props {
   editable: boolean
   updateObject: (object: SearchableObject, position: number) => void
   updateUncap: (id: string, position: number, uncap: number) => void
+  removeCharacter: (id: string) => void
 }
 
 const CharacterUnit = (props: Props) => {
@@ -49,6 +53,9 @@ const CharacterUnit = (props: Props) => {
     filled: props.gridCharacter !== undefined,
   })
 
+  const [modalOpen, setModalOpen] = useState(false)
+  const [alertOpen, setAlertOpen] = useState(false)
+
   const gridCharacter = props.gridCharacter
   const character = gridCharacter?.object
 
@@ -115,22 +122,71 @@ const CharacterUnit = (props: Props) => {
     </SearchModal>
   )
 
-  const contextMenu = () => {
-    return props.editable && gridCharacter && gridCharacter.id ? (
-      <ContextMenu>
-        <ContextMenuTrigger asChild>
-          <Button accessoryIcon={<SettingsIcon />} className="Options" />
-        </ContextMenuTrigger>
-        <ContextMenuContent align="start">
-          <ContextMenuItem>Modify character</ContextMenuItem>
-          <ContextMenuItem>Remove from grid</ContextMenuItem>
-        </ContextMenuContent>
-      </ContextMenu>
-    ) : (
-      ''
+  function openCharacterModal(event: Event) {
+    setModalOpen(true)
+  }
+
+  function onCharacterModalOpenChange(open: boolean) {
+    setModalOpen(open)
+  }
+
+  function openRemoveCharacterAlert() {
+    setAlertOpen(true)
+  }
+
+  function removeCharacter() {
+    if (gridCharacter) props.removeCharacter(gridCharacter.id)
+  }
+
+  const removeAlert = () => {
+    return (
+      <Alert
+        open={alertOpen}
+        primaryAction={removeCharacter}
+        primaryActionText={t('modals.characters.buttons.remove')}
+        cancelAction={() => setAlertOpen(false)}
+        cancelActionText={t('buttons.cancel')}
+        message={
+          <Trans i18nKey="modals.characters.messages.remove">
+            Are you sure you want to remove{' '}
+            <strong>{{ character: gridCharacter?.object.name[locale] }}</strong>{' '}
+            from your team?
+          </Trans>
+        }
+      />
     )
   }
 
+  const contextMenu = () => {
+    if (props.editable && gridCharacter && gridCharacter.id) {
+      return (
+        <>
+          <ContextMenu>
+            <ContextMenuTrigger asChild>
+              <Button accessoryIcon={<SettingsIcon />} className="Options" />
+            </ContextMenuTrigger>
+            <ContextMenuContent align="start">
+              <ContextMenuItem onSelect={openCharacterModal}>
+                Modify character
+              </ContextMenuItem>
+              <ContextMenuItem onSelect={openRemoveCharacterAlert}>
+                Remove from grid
+              </ContextMenuItem>
+            </ContextMenuContent>
+          </ContextMenu>
+          <CharacterModal
+            gridCharacter={gridCharacter}
+            open={modalOpen}
+            onOpenChange={onCharacterModalOpenChange}
+          />
+          {removeAlert()}
+        </>
+      )
+    }
+  }
+
+  //
+
   const unitContent = (
     <div className={classes}>
       {contextMenu()}
diff --git a/components/ContextMenuItem/index.tsx b/components/ContextMenuItem/index.tsx
index 15600c52..be1b7ec9 100644
--- a/components/ContextMenuItem/index.tsx
+++ b/components/ContextMenuItem/index.tsx
@@ -4,11 +4,11 @@ import { DropdownMenuItem } from '@radix-ui/react-dropdown-menu'
 
 import './index.scss'
 
-interface Props
-  extends React.DetailedHTMLProps<
-    React.DialogHTMLAttributes<HTMLDivElement>,
-    HTMLDivElement
-  > {}
+interface Props {
+  className?: string
+  onSelect?: (event: Event) => void
+  children: React.ReactNode
+}
 
 const ContextMenuItem = React.forwardRef<HTMLDivElement, Props>(
   function ContextMenu({ children, ...props }, forwardedRef) {
@@ -19,7 +19,11 @@ const ContextMenuItem = React.forwardRef<HTMLDivElement, Props>(
       props.className
     )
 
-    return <DropdownMenuItem className={classes}>{children}</DropdownMenuItem>
+    return (
+      <DropdownMenuItem className={classes} onSelect={props.onSelect}>
+        {children}
+      </DropdownMenuItem>
+    )
   }
 )
 
diff --git a/public/locales/en/common.json b/public/locales/en/common.json
index 0235580d..8229ee58 100644
--- a/public/locales/en/common.json
+++ b/public/locales/en/common.json
@@ -144,8 +144,12 @@
         "earring": "Aetherial Mastery",
         "awakening": "Awakening"
       },
+      "messages": {
+        "remove": "Are you sure you want to remove <strong>{{character}}</strong> from your team?"
+      },
       "buttons": {
-        "confirm": "Save character"
+        "confirm": "Save character",
+        "remove": "Remove character"
       }
     },
     "conflict": {
diff --git a/public/locales/ja/common.json b/public/locales/ja/common.json
index 4c3786b2..a1f2044b 100644
--- a/public/locales/ja/common.json
+++ b/public/locales/ja/common.json
@@ -144,8 +144,12 @@
         "earring": "エーテリアルプラス",
         "awakening": "覚醒"
       },
+      "messages": {
+        "remove": "<strong>{{character}}</strong>を編成から削除しますか？"
+      },
       "buttons": {
-        "confirm": "キャラクターを変更する"
+        "confirm": "キャラクターを変更する",
+        "remove": "キャラクターを削除する"
       }
     },
     "conflict": {