diff --git a/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyImageKeywordsActionGroup.xml b/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyImageKeywordsActionGroup.xml
index 0cb86ae80648..2fc4f7ea25fd 100644
--- a/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyImageKeywordsActionGroup.xml
+++ b/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyImageKeywordsActionGroup.xml
@@ -13,12 +13,12 @@
             <description>Verifies image keywords on the View Details panel</description>
         </annotations>
         <arguments>
-            <argument name="keywords" />
+            <argument name="keywords"/>
         </arguments>
 
-        <grabTextFrom selector="{{AdminEnhancedMediaGalleryViewDetailsSection.keywords}}" stepKey="grabDescription"/>
-        <assertStringContainsString stepKey="verifyDescription">
-            <actualResult type="variable">grabDescription</actualResult>
+        <grabTextFrom selector="{{AdminEnhancedMediaGalleryViewDetailsSection.keywords}}" stepKey="grabKeywords"/>
+        <assertStringContainsString stepKey="verifyKeywords">
+            <actualResult type="variable">grabKeywords</actualResult>
             <expectedResult type="string">{{keywords}}</expectedResult>
         </assertStringContainsString>
     </actionGroup>
diff --git a/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryEditAssetAddKeywordActionGroup.xml b/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryEditAssetAddKeywordActionGroup.xml
new file mode 100644
index 000000000000..964b33dd38d5
--- /dev/null
+++ b/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryEditAssetAddKeywordActionGroup.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminMediaGalleryEditAssetAddKeywordActionGroup">
+        <annotations>
+            <description>Set Keywords on the Edit Details panel</description>
+        </annotations>
+        <arguments>
+            <argument name="keyword"/>
+        </arguments>
+
+        <fillField selector="{{AdminEnhancedMediaGalleryEditDetailsSection.newKeyword}}" userInput="{{keyword}}" stepKey="enterKeyword"/>
+        <click selector="{{AdminEnhancedMediaGalleryEditDetailsSection.addNewKeyword}}" stepKey="addKeyword"/>
+    </actionGroup>
+</actionGroups>
diff --git a/MediaGalleryUi/Test/Mftf/Data/AdminEnhancedMediaGalleryImageData.xml b/MediaGalleryUi/Test/Mftf/Data/AdminEnhancedMediaGalleryImageData.xml
index f4f304aaa1a5..62323003da96 100644
--- a/MediaGalleryUi/Test/Mftf/Data/AdminEnhancedMediaGalleryImageData.xml
+++ b/MediaGalleryUi/Test/Mftf/Data/AdminEnhancedMediaGalleryImageData.xml
@@ -14,6 +14,7 @@
         <data key="file">magento.jpg</data>
         <data key="fileName">renamed title</data>
         <data key="extension">jpg</data>
+        <data key="keyword">newkeyword</data>
     </entity>
     <entity name="ImageMetadata" type="image">
         <data key="title">Title of the magento image</data>
diff --git a/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryEditDetailsSection.xml b/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryEditDetailsSection.xml
index 7a2478ab760a..b8e2f698ccfe 100644
--- a/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryEditDetailsSection.xml
+++ b/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryEditDetailsSection.xml
@@ -12,6 +12,8 @@
         <element name="title" type="input" selector="#title"/>
         <element name="fileName" type="text" selector="#path"/>
         <element name="description" type="textarea" selector="#description"/>
+        <element name="newKeyword" type="input" selector="[data-ui-id='keyword']"/>
+        <element name="addNewKeyword" type="input" selector="[data-ui-id='add-keyword']"/>
         <element name="cancel" type="button" selector="#image-details-action-cancel"/>
         <element name="save" type="button" selector="#image-details-action-save"/>
     </section>
diff --git a/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryViewDetailsEditTest.xml b/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryViewDetailsEditTest.xml
index 660c4904e5a5..2cf6bf5dfe62 100644
--- a/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryViewDetailsEditTest.xml
+++ b/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryViewDetailsEditTest.xml
@@ -30,6 +30,9 @@
         </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="viewImageDetails"/>
         <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsEditActionGroup" stepKey="editImage"/>
+        <actionGroup ref="AdminMediaGalleryEditAssetAddKeywordActionGroup" stepKey="setKeywords">
+            <argument name="keyword" value="UpdatedImageDetails.keyword"/>
+        </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsSaveActionGroup" stepKey="saveImage">
             <argument name="image" value="UpdatedImageDetails"/>
         </actionGroup>
@@ -42,5 +45,11 @@
         <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageDescriptionActionGroup" stepKey="verifyImageDescription">
             <argument name="description" value="UpdatedImageDetails.description"/>
         </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageKeywordsActionGroup" stepKey="verifyAddedKeywords">
+            <argument name="keywords" value="UpdatedImageDetails.keyword"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageKeywordsActionGroup" stepKey="verifyMetadataKeywords">
+            <argument name="keywords" value="ImageMetadata.keywords"/>
+        </actionGroup>
     </test>
 </tests>
diff --git a/MediaGalleryUi/view/adminhtml/web/template/image/image-edit.html b/MediaGalleryUi/view/adminhtml/web/template/image/image-edit.html
index 263f6f10244b..cd1cba3b086d 100644
--- a/MediaGalleryUi/view/adminhtml/web/template/image/image-edit.html
+++ b/MediaGalleryUi/view/adminhtml/web/template/image/image-edit.html
@@ -60,7 +60,7 @@
                             </div>
                             <div class="admin__field admin__field-group-additional admin__field-small">
                                 <div class="admin__field-control">
-                                    <button type="button" class="action-basic" data-bind="click: addKeyword">
+                                    <button type="button" data-ui-id="add-keyword" class="action-basic" data-bind="click: addKeyword">
                                         <span data-bind="i18n: 'Add'"></span>
                                     </button>
                                 </div>