diff --git a/src/actions/plugins/surround.ts b/src/actions/plugins/surround.ts
index 3754086bd..0a7ddf453 100644
--- a/src/actions/plugins/surround.ts
+++ b/src/actions/plugins/surround.ts
@@ -277,7 +277,12 @@ export class CommandSurroundAddToReplacement extends BaseCommand {
     let endReplace = replacement;
 
     if (startReplace[0] === "<") {
-      endReplace = startReplace[0] + "/" + startReplace.slice(1);
+      let tagName = /([-\w]+)/.exec(startReplace);
+      if (tagName) {
+        endReplace = `</${tagName[1]}>`;
+      } else {
+        endReplace = "</" + startReplace.slice(1);
+      }
     }
 
     if (startReplace.length === 1 && startReplace in PairMatcher.pairings) {
diff --git a/test/plugins/surround.test.ts b/test/plugins/surround.test.ts
index b5d6d4ec2..c196ed3f4 100644
--- a/test/plugins/surround.test.ts
+++ b/test/plugins/surround.test.ts
@@ -33,6 +33,13 @@ suite("surround plugin", () => {
       end: ["first <123>|line</123> test"],
     });
 
+    newTest({
+      title: "ysiw< surrounds word with tags and attributes",
+      start: ["first li|ne test"],
+      keysPressed: 'ysiw<abc attr1 attr2="test">',
+      end: ['first <abc attr1 attr2="test">|line</abc> test'],
+    });
+
     newTest({
       title: "change surround",
       start: ["first 'li|ne' test"],