diff --git a/api/v1/shortcut.go b/api/v1/shortcut.go
index e0f6429..b1f8e50 100644
--- a/api/v1/shortcut.go
+++ b/api/v1/shortcut.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"net/http"
 	"strconv"
+	"strings"
 
 	"github.com/boojack/shortify/store"
 
@@ -51,6 +52,7 @@ type Shortcut struct {
 	Link        string     `json:"link"`
 	Description string     `json:"description"`
 	Visibility  Visibility `json:"visibility"`
+	Tags        []string   `json:"tags"`
 }
 
 type CreateShortcutRequest struct {
@@ -58,6 +60,7 @@ type CreateShortcutRequest struct {
 	Link        string     `json:"link"`
 	Description string     `json:"description"`
 	Visibility  Visibility `json:"visibility"`
+	Tags        []string   `json:"tags"`
 }
 
 type PatchShortcutRequest struct {
@@ -66,6 +69,7 @@ type PatchShortcutRequest struct {
 	Link        *string     `json:"link"`
 	Description *string     `json:"description"`
 	Visibility  *Visibility `json:"visibility"`
+	Tags        []string    `json:"tags"`
 }
 
 func (s *APIV1Service) registerShortcutRoutes(g *echo.Group) {
@@ -86,6 +90,7 @@ func (s *APIV1Service) registerShortcutRoutes(g *echo.Group) {
 			Link:        create.Link,
 			Description: create.Description,
 			Visibility:  convertVisibilityToStore(create.Visibility),
+			Tag:         strings.Join(create.Tags, " "),
 		})
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to create shortcut").SetInternal(err)
@@ -139,6 +144,10 @@ func (s *APIV1Service) registerShortcutRoutes(g *echo.Group) {
 		if patch.Visibility != nil {
 			shortcutUpdate.Visibility = (*store.Visibility)(patch.Visibility)
 		}
+		if patch.Tags != nil {
+			tag := strings.Join(patch.Tags, " ")
+			shortcutUpdate.Tag = &tag
+		}
 		shortcut, err = s.Store.UpdateShortcut(ctx, shortcutUpdate)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to patch shortcut").SetInternal(err)
@@ -267,5 +276,6 @@ func convertShortcutFromStore(shortcut *store.Shortcut) *Shortcut {
 		Description: shortcut.Description,
 		Visibility:  Visibility(shortcut.Visibility),
 		RowStatus:   RowStatus(shortcut.RowStatus),
+		Tags:        strings.Split(shortcut.Tag, " "),
 	}
 }