diff --git a/src/client/routes/home/index.js b/src/client/routes/home/index.js
index a92427fa..cfca0108 100644
--- a/src/client/routes/home/index.js
+++ b/src/client/routes/home/index.js
@@ -27,6 +27,7 @@ import {
     IconCopy,
     IconCheck,
     IconSettings,
+    IconHeading,
 } from '@tabler/icons';
 
 import Error from '../../components/info/error';
@@ -37,6 +38,7 @@ import { createSecret, burnSecret } from '../../api/secret';
 
 const Home = () => {
     const [text, setText] = useState('');
+    const [title, setTitle] = useState('');
 
     const [ttl, setTTL] = useState(14400);
     const [password, setPassword] = useState('');
@@ -79,10 +81,14 @@ const Home = () => {
         }
     }, [enablePassword]);
 
-    const onTextareChange = (event) => {
+    const onTextareaChange = (event) => {
         setText(event.target.value);
     };
 
+    const onTitleChange = (event) => {
+        setTitle(event.target.value);
+    };
+
     const onSelectChange = (value) => {
         setTTL(value);
     };
@@ -124,6 +130,8 @@ const Home = () => {
         event.preventDefault();
 
         formData.append('text', text);
+
+        formData.append('title', title);
         formData.append('password', password);
         formData.append('ttl', ttl);
         formData.append('allowedIp', allowedIp);
@@ -182,12 +190,20 @@ const Home = () => {
                     maxRows={secretId ? 4 : 1000}
                     autosize
                     placeholder="Write your sensitive information.."
-                    onChange={onTextareChange}
+                    onChange={onTextareaChange}
                     value={text}
                     readOnly={inputReadOnly}
                     error={secretError}
                 />
 
+                <TextInput
+                    icon={<IconHeading />}
+                    placeholder="Title"
+                    value={title}
+                    onChange={onTitleChange}
+                    readOnly={inputReadOnly}
+                />
+
                 <Group spacing="lg">
                     <Select
                         value={ttl}
diff --git a/src/client/routes/secret/index.js b/src/client/routes/secret/index.js
index bb4f6a20..ed0d3df2 100644
--- a/src/client/routes/secret/index.js
+++ b/src/client/routes/secret/index.js
@@ -4,7 +4,14 @@ import { useParams, Link } from 'react-router-dom';
 import validator from 'validator';
 
 import { Button, Group, Container, Textarea, TextInput, Stack, Title, Text } from '@mantine/core';
-import { IconSquarePlus, IconDownload, IconLock, IconEye, IconPerspective } from '@tabler/icons';
+import {
+    IconSquarePlus,
+    IconDownload,
+    IconLock,
+    IconEye,
+    IconPerspective,
+    IconHeading,
+} from '@tabler/icons';
 
 import Error from '../../components/info/error';
 
@@ -14,6 +21,7 @@ import { downloadFile } from '../../api/upload';
 const Secret = () => {
     const { secretId, encryptionKey = null } = useParams();
     const [secret, setSecret] = useState(null);
+    const [title, setTitle] = useState(null);
     const [isSecretOpen, setIsSecretOpen] = useState(false);
     const [password, setPassword] = useState('');
     const [isPasswordRequired, setIsPasswordRequired] = useState(false);
@@ -50,6 +58,10 @@ const Secret = () => {
         } else {
             setSecret(validator.unescape(json.secret));
 
+            if (json.title) {
+                setTitle(validator.unescape(json.title));
+            }
+
             if (json.file) {
                 setFile(json.file);
             }
@@ -111,6 +123,8 @@ const Secret = () => {
 
                 <Text>We will only show the secret once.</Text>
 
+                {title && <TextInput icon={<IconHeading />} value={title} readOnly />}
+
                 {isSecretOpen && (
                     <Textarea minRows={10} maxRows={30} value={secret} autosize readOnly />
                 )}
diff --git a/src/server/controllers/secret.js b/src/server/controllers/secret.js
index aea878d1..89be3162 100644
--- a/src/server/controllers/secret.js
+++ b/src/server/controllers/secret.js
@@ -46,6 +46,10 @@ async function getSecretRoute(request, reply) {
         Object.assign(result, { file: JSON.parse(data.file) });
     }
 
+    if (data.title) {
+        Object.assign(result, { title: data.title });
+    }
+
     Object.assign(result, { secret: decrypt(JSON.parse(data.secret), encryptionKey).toString() });
 
     redis.deleteSecret(id);
@@ -79,7 +83,7 @@ async function secret(fastify) {
             preValidation: [fastify.rateLimit, fastify.keyGeneration, fastify.attachment],
         },
         async (req, reply) => {
-            const { text, ttl, password, allowedIp, preventBurn } = req.body;
+            const { text, title, ttl, password, allowedIp, preventBurn } = req.body;
             const { encryptionKey, secretId, file } = req.secret;
 
             if (Buffer.byteLength(text?.value) > config.get('api.maxTextSize')) {
@@ -90,14 +94,21 @@ async function secret(fastify) {
                 });
             }
 
+            if (title?.value.length > 255) {
+                return reply.code(413).send({
+                    error: `The title is longer than 255 characters which is not allowed.`,
+                });
+            }
+
             if (allowedIp?.value && !ipCheck(allowedIp.value)) {
                 return reply.code(409).send({ error: 'The IP address is not valid' });
             }
 
             const data = {
                 id: secretId,
+                title: validator.escape(title?.value),
                 secret: JSON.stringify(encrypt(validator.escape(text?.value), encryptionKey)),
-                allowedIp: allowedIp?.value,
+                allowedIp: validator.escape(allowedIp?.value),
             };
 
             if (password?.value) {
diff --git a/src/server/services/redis.js b/src/server/services/redis.js
index e3352907..8d595347 100644
--- a/src/server/services/redis.js
+++ b/src/server/services/redis.js
@@ -30,6 +30,10 @@ async function createSecret(data, ttl) {
     const key = `secret:${data.id}`;
     const prepare = [key, 'secret', data.secret];
 
+    if (data.title) {
+        prepare.push(...['title', data.title]);
+    }
+
     if (data.password) {
         prepare.push(...['password', data.password]);
     }