diff --git a/app/Http/Controllers/Admin/Shop/MerchandiseController.php b/app/Http/Controllers/Admin/Shop/MerchandiseController.php
index 3d9644a1..9874ef30 100644
--- a/app/Http/Controllers/Admin/Shop/MerchandiseController.php
+++ b/app/Http/Controllers/Admin/Shop/MerchandiseController.php
@@ -32,7 +32,7 @@ class MerchandiseController extends Controller
     public function edit($id)
     {
         $data = Merchandises::init();
-        $data['merchandise'] = Merchandises::getArray($id);
+        $data['merchandise'] = Merchandises::getFull($id);
 
         return view('Admin.Shop.Merchandises.edit', $data);
     }
diff --git a/app/Repositories/Shop/Merchandises.php b/app/Repositories/Shop/Merchandises.php
index 3cff5955..a7698c9d 100644
--- a/app/Repositories/Shop/Merchandises.php
+++ b/app/Repositories/Shop/Merchandises.php
@@ -30,6 +30,20 @@ class Merchandises
         return $export;
     }
 
+    public static function getFull($id)
+    {
+        $merchandise = self::get($id);
+        $data = $merchandise->toArray();
+        $data['tags'] = self::getTagsByMerchandise($merchandise);
+
+        return $data;
+    }
+
+    public static function getTagsByMerchandise($merchandise)
+    {
+        return Tag::getTagsByModel($merchandise);
+    }
+
     public static function getPrices($id)
     {
         return Merchandise::with(['price_lists.price_list_values', 'price_lists.sale_channel'])->find($id);